Formatting fixes, small changes.