Better programming (16/34)

Better programming