Final Stages, Refactoring