Nicer output; Split unsubscribe code