Clean up of lint errors