scene change and const refactoring