Some refactoring on Scene