Litle cleanup