fix syntax type, more lint cleanup