More linting and formatting