cleaned up; removed some debugging code