Better form (18/26)

Better form