QA: Simplify code a bit
QA: Typo
QA: Declare