Little bit more cleanup