Code clean-up:Debug