fix var name and white spaces