Cleaned up some confusing variable names