Made parameters more readable