QA: Simplify code