diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php
index 2be4cb8855..3f470015f6 100644
--- a/phpBB/includes/style/style.php
+++ b/phpBB/includes/style/style.php
@@ -22,28 +22,33 @@ if (!defined('IN_PHPBB'))
 class phpbb_style
 {
 	/**
-	* @var phpbb_template Template class.
+	* Template class.
 	* Handles everything related to templates.
+	* @var phpbb_template
 	*/
 	private $template;
 
 	/**
-	* @var string phpBB root path
+	* phpBB root path
+	* @var string
 	*/
 	private $phpbb_root_path;
 
 	/**
-	* @var phpEx PHP file extension
+	* PHP file extension
+	* @var string
 	*/
 	private $phpEx;
 
 	/**
-	* @var phpbb_config phpBB config instance
+	* phpBB config instance
+	* @var phpbb_config
 	*/
 	private $config;
 
 	/**
-	* @var user current user
+	* Current user
+	* @var phpbb_user
 	*/
 	private $user;
 
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php
index 836046e92b..01c79eec4e 100644
--- a/phpBB/includes/template/locator.php
+++ b/phpBB/includes/template/locator.php
@@ -35,18 +35,6 @@ if (!defined('IN_PHPBB'))
 */
 interface phpbb_template_locator
 {
-	/**
-	* Sets the list of style paths
-	*
-	* These paths will be searched for style files in the provided order.
-	* Paths may be outside of phpBB, but templates loaded from these paths
-	* will still be cached.
-	*
-	* @param array $style_paths An array of paths to style directories
-	* @return null
-	*/
-	public function set_paths($style_paths);
-
 	/**
 	* Sets the template filenames for handles. $filename_array
 	* should be a hash of handle => filename pairs.
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index 0a3e992b03..e6512c8417 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -32,33 +32,39 @@ if (!defined('IN_PHPBB'))
 class phpbb_template
 {
 	/**
-	* @var phpbb_template_context Template context.
+	* Template context.
 	* Stores template data used during template rendering.
+	* @var phpbb_template_context
 	*/
 	public $context;
 
 	/**
-	* @var string Path of the cache directory for the template
+	* Path of the cache directory for the template
+	* @var string
 	*/
 	public $cachepath = '';
 
 	/**
-	* @var string phpBB root path
+	* phpBB root path
+	* @var string
 	*/
 	private $phpbb_root_path;
 
 	/**
-	* @var phpEx PHP file extension
+	* PHP file extension
+	* @var string
 	*/
 	private $phpEx;
 
 	/**
-	* @var phpbb_config phpBB config instance
+	* phpBB config instance
+	* @var phpbb_config
 	*/
 	private $config;
 
 	/**
-	* @var user current user
+	* Current user
+	* @var phpbb_user
 	*/
 	private $user;