Refactoring your code