Cleaned up variable names.