CLeaned up a touch.