cleanup whitespace
whitespace block preference
naming conventions