minor code refactor in communication structure