Cleaned up some of the crappier variable names