Minor cleanups to code
Minor cleanups to code

zeromq/zproject,eburkitt/zproject,taotetek/zproject,paddor/zproject,twhittock/zproject,zeromq/zproject,hintjens/zproject,asokoloski/zproject,twhittock/zproject,taotetek/zproject,keent/zproject,paddor/zproject,eburkitt/zproject,taotetek/zproject,zeromq/zproject,paddor/zproject,asokoloski/zproject,hintjens/zproject,keent/zproject