diff --git a/lib/common/templates/scss/map-deep.template b/lib/common/templates/scss/map-deep.template
index 1b6728ff7..360eb6b31 100644
--- a/lib/common/templates/scss/map-deep.template
+++ b/lib/common/templates/scss/map-deep.template
@@ -13,20 +13,17 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
-%>
-<%
+%><%
     // for backward compatibility we need to have the user explicitly hide it
     var showFileHeader = (this.options && this.options.hasOwnProperty('showFileHeader')) ? this.options.showFileHeader : true;
     if(showFileHeader) {
         var header = '';
-        header += "/*\n  Do not edit directly";
+        header += "\n/*\n  Do not edit directly";
         header += "\n  Generated on " + new Date().toUTCString();
-        header += "\n*/\n";
+        header += "\n*/\n\n";
         print(header);
     }
 
-    print("\n");
-
     // output the list of tokens as Sass variables
     //
     _.each(allProperties, function(prop) {
diff --git a/lib/common/templates/scss/map-flat.template b/lib/common/templates/scss/map-flat.template
index 5b58c11e5..1741505e3 100644
--- a/lib/common/templates/scss/map-flat.template
+++ b/lib/common/templates/scss/map-flat.template
@@ -13,20 +13,17 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
-%>
-<%
+%><%
     // for backward compatibility we need to have the user explicitly hide it
     var showFileHeader = (this.options && this.options.hasOwnProperty('showFileHeader')) ? this.options.showFileHeader : true;
     if(showFileHeader) {
         var header = '';
-        header += "/*\n  Do not edit directly";
+        header += "\n/*\n  Do not edit directly";
         header += "\n  Generated on " + new Date().toUTCString();
-        header += "\n*/\n";
+        header += "\n*/\n\n";
         print(header);
     }
 
-    print('\n');
-
     var output = '';
     output += `$${this.mapName||'tokens'}: (\n`;
     output += allProperties.map(function(prop){