Client Decoder - cleaning up Code