More refactoring of old scene code