Tweaks and tidy up