This makes it easier to read. We do the same for cdv so it becomes more
consistent as well.
Signed-off-by: NPatrik Jakobsson <patrik.r.jakobsson@gmail.com>