Fixing up lint errors
Updated more lint items