more tidy ups