Refactor journalist controller