Smooth lighting & refactoring