couple of tidy ups