Better programming (32/34)

Better programming