Refactor for consistency
Work around for https://github.com/gulpjs/gulp/issues/455