Finished refactorings, google search demo is ok.