Refactoring and JSON API Responses