clean up and commenting