Small clean-up refactor
More focused logging