Part 2 of refactoring