Fixes to formatting