Refactoring More