Make logging in more unified