Better form (2/26)

Better form