Litle bit of a cleanup