llrb refactoring