Main scene minor refactoring