More linting and fixing