Cleaned up a bunch of variable names