Renamed helper functions; removed unneeded stuff