a couple clean ups