Refactor Logging Context, see #3