Replaced underscores in variable names to make them camelcase