cleanup more lint issues