Better form (3/26)

Better form