QA: Simplify code a bit