General linting and style fixes.