making more lint corrections