Scene - refactoring