Renamed some things for readability