Bring lint warnings below 100