Minor QC refactoring