More lint cleanup