Fixing a bunch of linter stuff.