Clean up and renaming

* renamed functions and channels to be more clear
* ran through go fmt
* some setup for next steps