Remove TODO's and reformat subheaders