refactor: better var names