minor cleanup in encoders