Minor linting and polish