some cleanup in function names