lint fixes

just some of the lint errors on develop branch