Make lint more happy about the code