Better form (4/26)

Better form