Refactoring + added some unhappy paths in GET new