Tweaking and tidying