cleaning things up slowly but surely