Tweaking and tidying.