ON STAGE REFACTORING