Minor refactoring & cleanup
0.2.5 Fix connection collection logic