Separated encoder from compressor
Separated decoder from compressor
Cleaned some whitespace