refactor names of vars