Switching to a response object
Some aesthetic fixes