More minor updates for readability.