More reformatting and more comments