Reformatting and some comments