Better form (19/26)

Better form