Cleaned up variable names