Scene class refactoring