rename logger, and simplify