Better programming (8/34)

Better programming