#45 refactor building user response to eliminate code duplication