Tidy ups and tweaks