Moved more bill logic to the Bill object vs. inline in the templates