Refactoring

Part 2