Refactorization and lighting optimization 33