improvements to logging output & removed commented code