cleaned up/reorganized some function names.