Tweaks and tidying up