Better form (5/26)

Better form