Renamed some things for clearer code