refactor scene