disabledAds defaults to true + refactored few things

disabledAds defaults to true + refactored few things