Refactor for variable consistency