Did some code cleanup and fixed the subscription list defect.