cleanup

* removed unecessary goroutine
* add composite literals to remove compile warnings