misc lint cleanup