refactor

Improve code design without changing behaviour. Use for the REFACTOR phase of XP workflow. All tests must pass before and after.