Refactoring of bills