Update Opt-In method names
Make method paramter cleaner