Code tidy and subscription details