Exciting style cleanup.