Fixes to formatting,