Refactoring Plan