linting and whitespace fixes