Reformat, and finally close #9