Finish refactoring bills_controller