Clean up and fix logic after all refactoring
Clean up and fix logic after all refactoring

warmchang/minikube,kubernetes/minikube,warmchang/minikube,kubernetes/minikube,kubernetes/minikube,warmchang/minikube,kubernetes/minikube,kubernetes/minikube,warmchang/minikube,warmchang/minikube,warmchang/minikube,kubernetes/minikube,warmchang/minikube,kubernetes/minikube