cleaning a couple things up