Begin cleaning up some issues the linter pointed out. Not a big deal, but worth doing.