Better form (25/26)

Better form