diff --git a/src/modules/core.js b/src/modules/core.js
index c00f0643..8a667e42 100644
--- a/src/modules/core.js
+++ b/src/modules/core.js
@@ -1669,7 +1669,7 @@
 			// Put at top for historical reasons. People are used to it being there.
 			banners.unshift(
 				'{{subst:WPAFC/article' +
-				( revId ? '|oldid=' + revId : '' ) +
+				( revId ? ' |oldid=' + revId : '' ) +
 				'}}'
 			);
 
@@ -1679,9 +1679,9 @@
 			// add biography banner to array
 			if ( isBiography ) {
 				banners.push(
-					'{{WikiProject Biography|living=' +
+					'{{WikiProject Biography |living=' +
 					( lifeStatus !== 'unknown' ? ( lifeStatus === 'living' ? 'yes' : 'no' ) : '' ) +
-					'|listas=' + subjectName +
+					' |listas=' + subjectName +
 					'}}'
 				);
 			}
@@ -1707,8 +1707,8 @@
 			// Add |class= to shell.
 			// Add |1=. Improves readability when lots of other parameters present.
 			wikicode = '{{WikiProject banner shell' +
-				( newAssessment ? '|class=' + newAssessment : '' ) +
-				'|1=\n' +
+				( newAssessment ? ' |class=' + newAssessment : '' ) +
+				' |1=\n' +
 				banners.join( '\n' ) +
 				'\n}}\n' +
 				wikicode;
diff --git a/tests/test-core.js b/tests/test-core.js
index 0d5f154e..14447323 100644
--- a/tests/test-core.js
+++ b/tests/test-core.js
@@ -132,8 +132,8 @@ describe( 'AFCH.addTalkPageBanners', () => {
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592485}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592485}}
 }}`
 		);
 	} );
@@ -150,8 +150,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592485}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592485}}
 }}
 
 == Hello ==
@@ -172,8 +172,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592485}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592485}}
 {{WikiProject Women}}
 }}
 {{translated page|ar|بحيرة كناو|version=|small=no|insertversion=|section=}}`
@@ -193,8 +193,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592485}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592485}}
 {{WikiProject Women}}
 }}
 {{translated page|ar|بحيرة كناو|version=|small=no|insertversion=|section=}}`
@@ -212,8 +212,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592485}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592485}}
 {{WikiProject Women}}
 }}`
 		);
@@ -232,8 +232,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592507}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592507}}
 {{WikiProject Women}}
 {{WikiProject Women's sport}}
 {{WikiProject Somalia}}
@@ -256,8 +256,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592507}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592507}}
 {{WikiProject Women}}
 {{WikiProject Women's sport}}
 {{WikiProject Somalia}}
@@ -281,12 +281,12 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = 'Lazarut, Raluca';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592507}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592507}}
 {{WikiProject Film}}
 {{WikiProject Women}}
 {{WikiProject Television}}
-{{WikiProject Biography|living=yes|listas=Lazarut, Raluca}}
+{{WikiProject Biography |living=yes |listas=Lazarut, Raluca}}
 {{WikiProject Romania}}
 }}`
 		);
@@ -307,8 +307,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592507}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592507}}
 {{WikiProject Women}}
 {{WikiProject Women's sport}}
 {{WikiProject Somalia}}
@@ -326,9 +326,9 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = 'Jones, Bob';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|class=B|1=
-{{subst:WPAFC/article|oldid=592496}}
-{{WikiProject Biography|living=yes|listas=Jones, Bob}}
+`{{WikiProject banner shell |class=B |1=
+{{subst:WPAFC/article |oldid=592496}}
+{{WikiProject Biography |living=yes |listas=Jones, Bob}}
 {{WikiProject Africa}}
 {{WikiProject Alabama}}
 }}`
@@ -345,9 +345,9 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592496}}
-{{WikiProject Biography|living=no|listas=}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592496}}
+{{WikiProject Biography |living=no |listas=}}
 }}`
 		);
 	} );
@@ -365,8 +365,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592496}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592496}}
 {{WikiProject Somalia}}
 }}`
 		);
@@ -382,8 +382,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|class=Disambig|1=
-{{subst:WPAFC/article|oldid=592681}}
+`{{WikiProject banner shell |class=Disambig |1=
+{{subst:WPAFC/article |oldid=592681}}
 {{WikiProject Disambiguation}}
 }}`
 		);
@@ -400,8 +400,8 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
 		const subjectName = '';
 		const output = AFCH.addTalkPageBanners( wikicode, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
 		expect( output ).toBe(
-`{{WikiProject banner shell|1=
-{{subst:WPAFC/article|oldid=592681}}
+`{{WikiProject banner shell |1=
+{{subst:WPAFC/article |oldid=592681}}
 {{OKA}}
 }}
 {{translated page|pl|Katowice Załęże|version=|small=no|insertversion=|section=}}`