v1b - Cleanup, -while, +for, 'is' and 'not' improved.