Some work on formatting