cleaned up a number of lint errors