Light reorganization and cleanup