Tidied comments and debug code