More formatting fixes for @sbesson