Code cleanup
ConnectionTimeout implementation