Added Google search + clean-up