Little bugfix in CdiUtils and reformat