Refactor; allow user to disable ID logging