Better form (14/26)

Better form