Clean up susbcription function some more.