Code cleaning on debug functions (see issue #1)