Clean up subscription code
Add a footer