Lint fixes and comments