cleaned up variable names