More scene refactoring

Control flow is confusing sometimes.