Better form (16/26)

Better form