Minor cleanup and reformatting.