CF #27 - Cleaning
CF #27 - Use selected plan code when subscribing