Refactor of ZeroMQ Transport

added small cleanup