Better form (21/26)

Better form