Refactored find-all and build-object to be more readable, shorter and