linting\n\ncleaning up some lint errors and warnings ... I've tried to keep style preference edits to a minimum