Refactor google code