cleanup
renamed some functions to match naming scheme for rest of class