Logging refactoring: base + javagal