Better form (7/26)

Better form