prelim work for cleanup
cleaned up some naming