Reviewing server.go code (with golint).
Cleaning watcher code.