Refactor report controller and snitch