Refactor CrimeController