Clean Code Refactoring Move Field