refactoring and lighting continued