Fixed most comments from https://git.opendaylight.org/gerrit/#/c/1721/