cleanup

cleaning up some function names and other minor cleanung tasks