Whitespace removal + grammar fixes