Code cleanup. Added datset and site selection. Added subscription creation