refactor Bill