Cleaned up some variable names...