Remove unnecessary explicit return
Try to fix normalize reporting endpoint

Still not happy with this, trying to find a way to push down
into strategies