Cleanup and Refactoring for Decoder
Added Content-Type and Accept headers