Clean, and some improvements