fix spaces
fix renaming of internal var