Lint update, better comments