Refactor report item factory, simplify switch statement