rename vars, refactor