Clean, and updated