Better programming (30/34)

Better programming