removal of outer enveloping function, and re-indentation of allmost all lines.
removal of outer enveloping function, and re-indentation of allmost all lines.

DBCDK/serviceprovider,DBCDK/serviceprovider