Make explicit local vars
Make function of whitespace stripper