Refactoring #1 complete