Removed underscores from variable names