Better Class Refactoring for Bill

Better Class Refactoring for Bill