bill and billscore model refactor
some model refactoring