Clean code up