Refactoring.  Reducing complexity