Improved reconnection logic and refactoring