Really clean that code up