Refactoring for light maps