scene refactoring