improve lint tool a bit