Start logging refactor