Refactoring + added tests