DdlstorageCom: updated regex
+ code cleanup