Tidied some remaining debug