QA: Whitespace / shorten class names