QA: Simplify a bit