Renamed some things and did some cleanup