Reformatting on Ch02 sources etc