refactor: change names, add comments