More simplification of go routines, channels and selects