organize code by logger. Update #470