Better form (6/26)

Better form