whitespace and var name fixes