whole bunch of linting changes
Down from ~200 lint issues to 20 or so