Tweaked and tidied