Fixed broken subscription_specs and slight refactor for clarity