Refactor.
Update changelog and help text.