Dr Bainbridge tidied up the debug statements and comments in the code just committed