Refactor build reporting