Refactor logging, ES6 components.