Refactoring + Tests