Little more cleanup