Reformatting try #3