Refactoring1