Merge "Lighty refactor"