Couple of tidy ups