Better programming (31/34)

Better programming