Cleaned up disused signal chan from Server
Ran go fmt
Tidied up a little