Refactor Main Stage