Small refactor
Renamed everything for easier reading