Correspondences- cleaner code