Refactor report controllers