Better form (8/26)

Better form