fix Unqualified variable and some withspace stuff