Better form (17/26)

Better form