Google, bundles, refactor
Little changes