Better form (10/26)

Better form