Refactor and Add minSdk = 14