fixing a load of lint errors