Better programming (24/34)

Better programming