Edit code and remove some prints