Refactored and clean up. Set up of the disqus plugin