added extra bundles and whitespace cleaner