QC / QA

Suggestions based on

QC / QA