Removed underscore from variable names