Re-add formatting, since branch merge removed that