Added LeastConnectedFirst strat. and tidy up