Refactoring Budget calculation and reporting