refactoring/ cleanup the vars;