Updating: tidying up.
Updating: differentiating (_) from _.