Made parameters more uniform.