Refactoring to Agility - page 1