More scene refactoring.