Better programming (9/34)

Better programming