Fixed up more lint errors
Fixing up more lint errors