improve logging flexability
fix code review comments