Debug message only in Debug Mode
Code clean-up