Some cleanup on the small stuff