Clean stuff up a bit