clean up & more manual