removed underscores for variable names