Refactor, mainly of content.js, to increase usage of keyword 'this'