Cleaned up some variable and function names.