var name modified and cleaning