clean up function names, regularize functionality