altered function names
cleared up function names