Refactoring Almost Finished