Renamed and cleaned up some stuff