small refactoring and format
remove all bundles