Improve arguments, refine wording