cleanup comments and logging
fix error from #144