Cleanup
Refactoring
Add analytics for js page load