some more clean up++