Better form (24/26)

Better form