- full code reformat for all custom bundles(revs #1)