Better form (22/26)

Better form