Some more tidy ups