Lint pass

Still two errors