Got all test green. Need refactor