subscription page code refactoring as per peer reviews

subscription page code refactoring as per peer reviews