clean stuff up a bit