Refactoring - tests pass - logback added - many pauses removed