Feature/lint review