few tidy ups