Little bit of cleanup