Reformatting and commenting