- QA: Simplify source code