Resolve QA with lint