Fixing up a lot of lint errors
Fixing up more lint errors
Fixing up remaining lint errors