few more tidy ups