Associate a unique connection id with each connection
fix code indentation