liquid refactoring