Some Clean code