fastbill refactoring