Better programming (22/34)

Better programming