Cleaned Decoder a little