formatting
diff --git a/faq/CommitterFAQ.xml b/faq/CommitterFAQ.xml
index 26908d7..52749af 100644
--- a/faq/CommitterFAQ.xml
+++ b/faq/CommitterFAQ.xml
@@ -10,8 +10,7 @@
   <category name="Website"/>
   <entry id="git_1" category="Build/Git">
     <question>Where are the source code repositories for the webtools project?</question>
-	<answer>
-	WTP's source code repositories are hosted on Eclipse.org and accessed through Gerrit. The following pages allow browsing the repositories and list the current cloning URLs at the bottom of the respective pages:<br/>
+	<answer>WTP's source code repositories are hosted on Eclipse.org and accessed through Gerrit. The following pages allow browsing the repositories and list the current cloning URLs at the bottom of the respective pages:<br/>
 	<a href="https://git.eclipse.org/c/gerrit/webtools-common/webtools.common.git">webtools.common</a><br/>
 	<a href="https://git.eclipse.org/c/gerrit/dali/webtools.dali.git">webtools.dali</a><br/>
 	<a href="https://git.eclipse.org/c/gerrit/jeetools/webtools.javaee.git">webtools.javaee</a><br/>
@@ -26,8 +25,7 @@
   </entry>
   <entry id="website_1" category="Website">
     <question>Who maintains the WTP website?</question>
-    <answer>
-	  The WTP website is maintained by the WTP Committers.<br/>
+    <answer>The WTP website is maintained by the WTP Committers.<br/>
       <br/>
       Problems and requests should be submitted by opening a <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Web%20Tools&amp;component=website">bug report</a>.
     </answer>
@@ -35,9 +33,7 @@
   <entry id="website_2" category="Website">
     <question>How do I update the WTP website?</question>
     <answer>
-    	<p>
-	  		The web site is itself hosted within a git repository, whose page can be found <a href="https://git.eclipse.org/c/www.eclipse.org/webtools.git/">here</a>. Updates pushed to it are not made live immediately, but periodically published within a matter of minutes.
-	  	</p>
+	The web site is itself hosted within a git repository, whose page can be found <a href="https://git.eclipse.org/c/www.eclipse.org/webtools.git/">here</a>. Updates pushed to it are not made live immediately, but periodically published within a matter of minutes.
     </answer>
   </entry>
   <entry id="general_1" category="General">
@@ -50,14 +46,11 @@
     <question>Who do we contact in order to get my password reset?</question>
     <answer>
  Use the <em>How do I reset my dev.eclipse.org password?</em> link at the sign-in page for
- <a href="http://accounts.eclipse.org">accounts.eclipse.org</a>
- .
-    </answer>
+ <a href="http://accounts.eclipse.org">accounts.eclipse.org</a>.</answer>
   </entry>
   <entry id="general_3" category="General">
 		<question>How can I set up a workspace for WTP development/extension?</question>
 		<answer>
-			<p>
 				There are multiple ways you can set up a workspace to either develop WTP or 
 				develop on the WTP base:
 				<ol>
@@ -131,7 +124,6 @@
 				<br/>
 				All three options require compiling some or all of WTP within your workspace, so your Plug-in Development Target
 				Platform should contain the corresponding WTP prerequisites.
-			</p>
 		</answer>
 	</entry>
   <entry id="source_1" category="Source Code">
@@ -242,7 +234,6 @@
   <entry id="git_6" category="Build/Git">
     <question>How do I add a new plug-in to WTP?</question>
     <answer>
-    	<p>
     		<b>Follow this procedure closely. Mistakes will likely cause a build breakage.</b><br/>
     		There are three tasks to add a new plug-in to WTP:
     		<ol>
@@ -274,7 +265,6 @@
     			<li>Send a note to the WTP <a href="mailto:wtp-releng@eclipse.org">release engineering</a> mailing list mentioning the plug-in's addition.  It is possible that the build process itself may require updates to accommodate the addition, such as touchups to releng-specific BVTs.
     			</li>
     		</ol>
-    	</p>
     </answer>
   </entry>
   <entry id="source_4" category="Source Code">
diff --git a/faq/stylesheets/faqphoenix.xsl b/faq/stylesheets/faqphoenix.xsl
index 5891247..b5619c2 100644
--- a/faq/stylesheets/faqphoenix.xsl
+++ b/faq/stylesheets/faqphoenix.xsl
@@ -133,8 +133,6 @@
                         <br />
                         <br />
                         <xsl:apply-templates select="faq:answer" />
-                        <br />
-                        <br />
                         <hr />
                         <br />
                     </li>