Remove debug println, and improved log stmt