Typos and whitespace cleanup