Clarifying parameters and improving consistency.