Grammar fixes and whitespace removal