Clean up bundles. Improve slim syntax.