Explicitly check Content-Type before decoding json
Just use the decorator on the class
Whitespace fixes
Fixed rebasing issues