Refactor Scene class