renaming; removed ancillary code