Make the building of return objects modular, DRY
Make the building of return objects modular, DRY