cleaned up route