Better form (20/26)

Better form