Lint cleanup