Formatting and fixes from reviews