[CHG/FIX] Some lint refactorings and fixes