Refactor scene