Decoder: Apply style fixes
Decoder: Some style refactors