Better form (23/26)

Better form