Simplify; tidy up.