More work on formatting