Recfactoring, small methods have been creates, all test passed
Recfactoring, all test passed