Mostly small style changes.
Merge branch 'master' of https://github.com/schasins/data-extraction-extension