removed underscores from variable names