Minor cleanup refactoring. Added tracking with Adobe Analytics.