All tests passing and overall refactoring.