Lint cleanup and review feedback.