Simplification of calculation for fossil fuels

Completion of previous commit (changes were not complete).