cleaned up function names
cleaned up function names
more cleanup and reworking