diff --git a/README.md b/README.md
index aa0238f..5cd9990 100644
--- a/README.md
+++ b/README.md
@@ -10,24 +10,16 @@ The codesy.io widget is an add-on for Firefox, Chrome, and Opera that adds codes
 2. Install requirements:
   * `cd widgets`
   * `npm install` (You can install globally with `npm install -g`)
-3. Run these gulp tasks to watch changes to files and compile extensions.
-  * gulp dev-chrome-unpacked - creates chrome/ directory and watches for changes
-  * gulp dev-chrome-packed - creates a zip file in /chrome and watches for changes
-  * gulp dev-firefox-unpacked - creates firefox/ directory and watches for changes
-  * gulp dev-firefox-packed - creates an xpi in firefox/ file and watches for changes
-
-combined tasks:
-  * gulp dev-packed - creates addon packages and watches for changes
-  * gulp dev-unpacked - creates directories with addon files and watches all for changes
+3. See the list of gulp tasks build or watch changes to files and compile extensions:
 
 
 ### To use the Chrome Extension
-1. Run one of the dev-chrome tasks above
+1. Run `workon-chrome-directory`
 2. Follow the [Unpacked Chrome Extensions
    docs](http://developer.chrome.com/extensions/getstarted.html#unpacked) and load the `chrome` directory
 
 ### To use the Firefox Add-on
-1. Run one of the dev-firefox tasks above
+1. Run `gulp workon-firefox-file`
 2. Goto the the //about:addons page
 3. Select 'Install Addon from File ...')
 4. Load the xpi file from the firefox directory
@@ -45,3 +37,26 @@ combined tasks:
   * Removes debug lines from .js files e.g. console.log
   * Creates an xpi file for uploading to the moz store.  The file contains the manifest.json file.
 2. Upload the xpi file to the moz store
+
+
+## Gulp Tasks
+
+#### build-{browser}-file:
+* **build-firefox-file**: create xpi for FF dev in the firefox.source directory with dev settings
+* **build-chrome-file**: create zip for chrome dev in the chrome.source directory with dev settings
+
+#### build-{browser}-directory:
+* **build-firefox-directory**: create firefox dev directroy in the firefox.source directory with dev settings
+* **build-chrome-directory**: create chrome dev directroy in the chrome.source directory with dev settings
+
+#### workon-{browser}-directory or workon-{browser}-directory:
+watches extension files and rebuilds
+* **workon-firefox-file**
+* **workon-firefox-directory**
+* **workon-chrome-file**
+* **workon-chrome-directory**
+
+#### publish-{browser}-file
+* **publish-firefox-file**: create xpi for FF prod
+* **publish-chrome-file**: create zip for chrome and opera
+* **publish-all**: creates all browser extension files
diff --git a/gulpfile.js b/gulpfile.js
index 687752d..5b95ad4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -41,67 +41,47 @@ const settings = {
 //    destination: (optional) path where files will go.  If destination is not included,
 //                  the functions will return a stream of files.
 
-javascript_src = function(options) {
-    return (
-        function({source, destination}) {
-            return function() {
-                console.log(`gather src ${source}/*.js files`)
-                console.log(`gather src ${settings.source}/*.js files`)
-
-                const js_files = gulp.src([`${source}/*.js`, `${settings.source}/*.js`])
-                    .pipe(headerComment(`codesy widget version ${settings.version}`))
-
-                if (destination){
-                    console.log(` destination ${destination}/js`);
-                    return js_files.pipe(gulp.dest(`${destination}/js`))
-                } else {
-                    return js_files
-                }
-            }
+function javascript_src ({source, destination}) {
+    return function() {
+        console.log(`gather src ${source}/*.js files`)
+        console.log(`gather src ${settings.source}/*.js files`)
+
+        const js_files = gulp.src([`${source}/*.js`, `${settings.source}/*.js`])
+            .pipe(headerComment(`codesy widget version ${settings.version}`))
+
+        if (destination){
+            console.log(` destination ${destination}/js`);
+            return js_files.pipe(gulp.dest(`${destination}/js`))
+        } else {
+            return js_files
         }
-    )(options)
+    }
 }
 
-static_files = function(destination) {
-    return (
-        function(destination,{glob, source}) {
-            return function() {
-                const static_stream = gulp.src(glob, { base: source, cwd: source })
-                if (destination){
-                    return static_stream.pipe(gulp.dest( destination ))
-                } else {
-                    return static_stream
-                }
-            }
-        }
-    )(destination,settings.static_files)
-}
+static_files = ({glob, source}) => gulp.src(glob, { base: source, cwd: source });
 
 // this function needs to include dev server details in the options object:
 //    dev_server: object with domain and port
 
-const manifest = function (options){
-  return (
-    function({source, destination}) {
-        return function() {
-            const common = gulp.src(`${settings.source}/manifest.json`)
-            const additions = gulp.src(`${source}/manifest_additions.json`)
-            manifest_stream = mergeStream(additions, common)
+function manifest({source, destination}){
+    return function() {
+        const common = gulp.src(`${settings.source}/manifest.json`)
+        const additions = gulp.src(`${source}/manifest_additions.json`)
+        manifest_stream = mergeStream(additions, common)
             .pipe(mergeJSON('manifest.json'))
             .pipe(jeditor(function(json) {
                 json.version=settings.version
                 return json
             }))
-            if (destination){
-                return manifest_stream.pipe(gulp.dest(destination));
-            } else {
-                return manifest_stream
-            }
+        if (destination){
+            return manifest_stream.pipe(gulp.dest(destination));
+        } else {
+            return manifest_stream
         }
-    })(options)
+    }
 }
 
-const add_dev_server = function (manifest_stream) {
+function add_dev_server (manifest_stream) {
     ({domain, port} = settings.dev_server)
     const warning = 'THIS IS NOT the production manifest.',
     dev_permission =`https://${domain}:${port}/`,
@@ -115,43 +95,38 @@ const add_dev_server = function (manifest_stream) {
         }))
 }
 
-const package = function (options, zipped, for_dev){
-    return (
-            function({source, destination: dest, extension: ext}, zipped, for_dev) {
-            return function() {
-                console.log(`package source: ${source}`);
-                let package_name, destination, package_stream;
-                let static_stream = (new static_files())()
-                let manifest_stream = (new manifest({source}))()
-                const js_stream = (new javascript_src( {source} ))()
-                    .pipe(rename( (path)=>path.dirname += "/js" ))
-
-                if (for_dev){
-                    manifest_stream = add_dev_server (manifest_stream)
-                    package_name = `${settings.name}-${settings.version}.dev.${ext}`
-                } else {
-                    js_stream.pipe(stripDebug())
-                    package_name = `${settings.name}-${settings.version}.${ext}`
-                }
-                destination = for_dev ? dest : settings.destination
-                console.log(`package dest: ${destination}`);
-
-                package_stream = mergeStream (manifest_stream,js_stream,static_stream)
-
-                if (zipped) {
-                    package_stream
-                        .pipe(zip(package_name))
-                        .pipe(gulp.dest(destination))
-                } else {
-                    package_stream
-                        .pipe(gulp.dest(destination));
-                }
-            }
+function package ({source, destination: dest, extension: ext}, zipped, for_dev){
+    return function() {
+        console.log(`package source: ${source}`);
+        const package_name = `${settings.name}-${settings.version}${for_dev?'.dev':''}.${ext}`
+        const destination = for_dev ? dest : settings.destination
+        console.log(`package dest: ${destination}`);
+
+        let static_stream = static_files(settings.static_files)
+        let manifest_stream = (new manifest({source}))()
+        const js_stream = (new javascript_src( {source} ))()
+            .pipe(rename( (path)=>path.dirname += "/js" ))
+
+        if (for_dev){
+            manifest_stream = add_dev_server (manifest_stream)
+        } else {
+            js_stream.pipe(stripDebug())
         }
-    )(options, zipped, for_dev)
+
+        const package_stream = mergeStream (manifest_stream,js_stream,static_stream)
+
+        if (zipped) {
+            package_stream
+                .pipe(zip(package_name))
+                .pipe(gulp.dest(destination))
+        } else {
+            package_stream
+                .pipe(gulp.dest(destination));
+        }
+    }
 }
 
-const watch_dev = function ({source}, task) {
+function watch_src ({source}, task) {
     console.log("start watching");
     const manifest_files = [`${settings.source}/manifest.json`,`${source}/manifest_additions.json`]
     const js_files = [`${source}/*.js`, `${settings.source}/*.js`]
@@ -160,48 +135,29 @@ const watch_dev = function ({source}, task) {
     gulp.watch(js_files, task)
 }
 
-// DEV TASKS
-gulp.task('dev-chrome-unpacked', ['chrome-unpacked'], function() {
-    watch_dev(settings.chrome,['chrome-unpacked'])
-})
-
-gulp.task('dev-chrome-packed', ['chrome-dev-zip'], function() {
-    watch_dev(settings.chrome,['chrome-dev-zip'])
-})
-
-gulp.task('dev-firefox-unpacked', ['firefox-unpacked'], function() {
-    watch_dev(settings.firefox,['firefox-unpacked'])
-})
-
-gulp.task('dev-firefox-packed', ['firefox-dev-xpi'], function() {
-    watch_dev(settings.firefox,['firefox-dev-xpi'])
-})
+const browsers = ['firefox', 'chrome']
+
+for (browser of browsers){
+    const build_file_task = `build-${browser}-file`
+    const build_directory_task = `build-${browser}-directory`
+    const options = settings[browser]
+
+    // ADDON BUILDING TASKS
+    gulp.task(build_file_task, (new package(options, true, true)))
+    gulp.task(build_directory_task, (new package(options, false, true)))
+    gulp.task(`publish-${browser}-file`, (new package(options, true, false)))
+
+    // WATCH TASKS
+    gulp.task(`workon-${browser}-directory`, [build_directory_task],
+        () => watch_src(options, [build_directory_task])
+    );
+    gulp.task(`workon-${browser}-file`, [build_file_task],
+        () => watch_src(options, [build_file_task])
+    );
+}
 
-gulp.task('dev-unpacked',['dev-chrome-unpacked','dev-firefox-unpacked'])
-gulp.task('dev-packed',['dev-chrome-packed','dev-firefox-packed'])
+const publish_tasks = browsers.map((b)=>`publish-${b}-file`)
+gulp.task('publish-all',publish_tasks)
 
 // FF dev must use file
-gulp.task('dev-mixed',['dev-chrome-unpacked','dev-firefox-packed'])
-
-
-// FILE BUILDING TASKS
-
-// create xpi for FF dev in the firefox.source directory with dev settings
-gulp.task('firefox-dev-xpi', (new package(settings.firefox, true, true)))
-
-// create firefox dev directroy in the firefox.source directory with dev settings
-gulp.task('firefox-unpacked', (new package(settings.firefox, false, true)))
-
-// create zip for chrome dev in the chrome.source directory with dev settings
-gulp.task('chrome-dev-zip', (new package(settings.chrome, true, true)))
-
-// create chrome dev directroy in the chrome.source directory with dev settings
-gulp.task('chrome-unpacked', (new package(settings.chrome, false, true)))
-
-// create xpi for FF prod
-gulp.task('publish-firefox', (new package(settings.firefox, true, false)))
-
-// create zip for chrome and opera
-gulp.task('publish-chrome', (new package(settings.chrome, true, false)))
-
-gulp.task('publish-all',['publish-firefox','publish-chrome'])
+gulp.task('workon-mixed',['workon-chrome-directory','workon-firefox-file'])
diff --git a/src/csp.js b/src/csp.js
index aa08a06..198ccb3 100644
--- a/src/csp.js
+++ b/src/csp.js
@@ -1,23 +1,17 @@
+function makeCspAppender (domain='') {
+    const csp_names = ['CONTENT-SECURITY-POLICY','X-WEBKIT-CSP']
+    const name_finder = (name) => (csp_name) => csp_name === name.toUpperCase()
+    const if_csp = (name) => csp_names.find(name_finder(name)) ? true : false
 
-githubFilter = {
-    urls: ["https://github.com/*"],
-    types: ["main_frame"]
-};
+    const codesy_types = 'connect-src child-src script-src style-src';
+    const is_codesy = (type) => codesy_types.indexOf(type) !== -1;
+    const add_codesy = (accum, word) =>`${accum} ${word} ${is_codesy(word) ? domain : '' }`;
+    const insert_domain = (csp) => csp.split(' ').reduce(add_codesy,'');
 
-headerOptions = ["responseHeaders", "blocking"]
-
-const makeCspAppender = function(domain='') {
-    const types = 'connect-src child-src script-src style-src font-src';
-    const isType = (word) => types.indexOf(word) !== -1;
-    const addDomain = (accum, word)=>`${accum} ${word} ${isType(word) ? domain : '' }`
-    const isCSP = function (name) {
-        name = name.toUpperCase()
-        return (name === 'CONTENT-SECURITY-POLICY') || (name === 'X-WEBKIT-CSP');
-    };
     return function({responseHeaders: headers}) {
         console.time('codesy map headers');
-        const responseHeaders = headers.map(function({name, value: v}){
-            value = isCSP(name) ? v.split(' ').reduce(addDomain,'') : v
+        const responseHeaders = headers.map(function({name, value: original}){
+            const value = if_csp(name) ? insert_domain(original) : original
             return {name,value}
         })
         console.timeEnd('codesy map headers');
@@ -27,7 +21,14 @@ const makeCspAppender = function(domain='') {
 
 let codesyAppender = new makeCspAppender()
 
-const setCodesyAppender = function(domain) {
+const githubFilter = {
+    urls: ["https://github.com/*"],
+    types: ["main_frame"]
+};
+
+const headerOptions = ["responseHeaders", "blocking"]
+
+function setCodesyAppender (domain) {
     if (chrome.webRequest.onHeadersReceived.hasListener(codesyAppender)) {
         chrome.webRequest.onHeadersReceived.removeListener(codesyAppender);
     }
diff --git a/src/issue.js b/src/issue.js
index ad54c31..a29f19f 100644
--- a/src/issue.js
+++ b/src/issue.js
@@ -1,71 +1,75 @@
 console.time('codesy issue load');
 
-const make_widget = ({domain}) => {
-    return new Promise((resolve)=>{
-        const codesy = {
-            css:
-                {attr: {
-                    rel: "stylesheet",
-                    type: "text/css"
-                }
-            },
-            iframe:
-                { attr:{
-                    id: "codesy_iframe",
-                    style: "visibility: collapse;",
-                    scrolling: "no",
-                    seamless: "seamless"
-                }
+function make_widget_appender (domain) {
+    const iframe_attr = {
+                id: "codesy_iframe",
+                style: "visibility: collapse;",
+                scrolling: "no",
+                seamless: "seamless",
             }
-        };
+    const $iframe = (url) => {
+        iframe_attr.src = `${domain}/bid-status/?${$.param({url})}`
+        return $('<iframe>').attr(iframe_attr)
+    }
+    const css_attr = {
+                rel: "stylesheet",
+                type: "text/css",
+                href: chrome.extension.getURL("css/iframe.css")
+            }
+    const $link = $('<link>').attr(css_attr);
+    const append_link = () => $("head").append($link);
+    const endtimer = () => console.timeEnd('codesy append iframe');
 
-        const add_link = (attr) => {
-            attr.href = chrome.extension.getURL("css/iframe.css")
-            return attr
-        }
-        const add_src = (url, attr)=> {
-            attr.src = `${domain}/bid-status/?${$.param({url})}`
-            return attr
-        }
-        const endtimer = ()=> console.timeEnd('codesy append iframe');
-        $link = () => $("head").append($('<link>').attr(add_link(codesy.css.attr)));
-        $iframe  = (new_url) => $('<iframe>').attr(add_src(new_url, codesy.iframe.attr))
-        const add = (new_url) => {
-            console.time('codesy append iframe');
-            $('body').append($iframe(new_url)).ready($link).ready(endtimer)
-        }
-        const remove = ()=> $(`#${codesy.iframe.attr.id}`).remove();
-        resolve( { url: '', add, remove })
-    })
+    return (url) => {
+        console.time('codesy append iframe');
+        $('body').append($iframe(url)).ready(append_link).ready(endtimer)
+        return ( { url, id: iframe_attr.id } )
+    }
 }
 
-const is_issue = (url)=>/https:\/\/github.com\/.*\/issues\/[1-9]+/g.test(url)
-
-const watch_the_href = (widget) => {
-    return new Promise((resolve)=>{
-        const watch = (url) => {
-            if (window.location.href !== widget.url){
-                widget.url = window.location.href
-                widget.remove()
-                if (is_issue(widget.url)) widget.add(widget.url);
-            }
-            window.setTimeout(watch, 600);
-        }
-        watch(window.location.href)
-    });
+function wait_for_issue_page () {
+    const issue_rx = /https:\/\/github.com\/.*\/issues\/[1-9]+/
+    function watch_for_issue(resolve) {
+        let url = window.location.href;
+        if ( issue_rx.test(url) ) return resolve(url)
+        window.setTimeout(watch_for_issue, 400, resolve);
+    }
+    return new Promise( (resolve) => {
+        watch_for_issue(resolve);
+    })
 };
 
-page_reload = ()=> window.location.reload(true);
+function wait_for_page_change  ( {url, id} ) {
+    function watch_href(resolve) {
+        if (window.location.href != url) {
+             $(`#${id}`).remove();
+            return resolve();
+        };
+        window.setTimeout(watch_href, 400, resolve);
+    }
+    return new Promise( (resolve) => {
+        watch_href(resolve);
+    })
+};
 
-const get_codesy_domain = () => {
-    return new Promise((resolve)=>{
-        chrome.storage.local.get(null, resolve)
-        chrome.storage.onChanged.addListener(page_reload)
+function get_codesy_domain () {
+    return new Promise((resolve) => {
+        const resolve_domain = ({domain}) => resolve(domain)
+        chrome.storage.local.get(null, resolve_domain)
     });
 }
+const prepare_widget = get_codesy_domain().then(make_widget_appender)
+const append_widget = ( [appender, url] ) => appender(url);
+
+function on_github_pages(){
+    Promise.all( [prepare_widget, wait_for_issue_page()] )
+        .then(append_widget)
+            .then(wait_for_page_change)
+                .then(on_github_pages)
+}
+on_github_pages()
 
-get_codesy_domain()
-    .then(make_widget)
-        .then(watch_the_href)
+page_reload = () => window.location.reload(true);
+chrome.storage.onChanged.addListener(page_reload)
 
 console.timeEnd('codesy issue load');
diff --git a/src/on_install.js b/src/on_install.js
index 49af840..76f4471 100644
--- a/src/on_install.js
+++ b/src/on_install.js
@@ -1,14 +1,14 @@
-const find_these = (query)=>{
+function find_these (query) {
     return new Promise((resolve)=>{
         chrome.tabs.query(query, resolve);
     });
 }
 
-const wait_for = (id, resolve)=>{
+function wait_for (id, resolve) {
     let times_checked = 0;
     let timerID, load_status;
-    const set_status = ({status})=>load_status=status
-    const check_until = (status)=>{
+    const set_status = ({status}) =>load_status=status
+    const check_until = (status) => {
         if (load_status === status || (times_checked += 1) > 150){
             window.clearTimeout(timerID)
             return resolve()
@@ -19,24 +19,24 @@ const wait_for = (id, resolve)=>{
     check_until ( 'complete' )
 }
 
-const reload = (id)=>{
-    return new Promise((resolve)=>{
+function reload (id) {
+    return new Promise((resolve) => {
         chrome.tabs.reload(id)
         wait_for(id, resolve)
     });
 }
 
-const reload_them = (tabs)=> {
+function reload_them (tabs) {
     const reloads = tabs.map(({id})=>reload(id))
     return Promise.all(reloads)
 }
 
-const select_them = (tabs)=> {
+function select_them (tabs) {
     tabs.map( ({id}) => chrome.tabs.update(id, {selected:true}) )
     return tabs
 }
 
-when_installed = ({reason}) => {
+function when_installed ({reason}) {
     find_these({ title: "*codesy.io*" })
             .then(select_them)
                 .then(reload_them)