BACKLOG-1048 Removed commented code
BACKLOG-1048 Formatted code
BACKLOG-1048 Simplified request/response factories and made them more alike
BACKLOG-1048 Corrected docblock
BACKLOG-1048 Corrected error message