Whitespace removal and typo fixes