Started working on formatting