Clean code up a bit