Refacto Departues & Arrivals