Some lint cleanup