adjusted debug helper
clean-up