More cleanup of the decoder class