Some cleanups to assume_quality plugin