fix trailing whitespace
fix unqualified variables