Fixes for Tom's comments, fix linting