Some more tidying up of the compressor