[145] Refactoring Connecting class; cleanup PrioritySailes;