Better form (15/26)

Better form