Cleaned up some function names