A little cleanup...if you can call it that