Formatting fixes from review