Making comments and debug prints more explicit