some cleanup goodness