few more tidy ups.