Lint and ending whitespace fixes