Reformatting mostly