more commenting and println removal