Refactoring with fluent interface