diff --git a/admin/code/AdminRootController.php b/admin/code/AdminRootController.php
index 765500c03..77a394ce6 100644
--- a/admin/code/AdminRootController.php
+++ b/admin/code/AdminRootController.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @package framework
+ * @subpackage admin
+ */
 class AdminRootController extends Controller {
 
 	/**
diff --git a/admin/code/CMSBatchAction.php b/admin/code/CMSBatchAction.php
index d6e0ea62a..4e28371e9 100644
--- a/admin/code/CMSBatchAction.php
+++ b/admin/code/CMSBatchAction.php
@@ -10,8 +10,8 @@
  * 	_t('CMSBatchActions.PUBLISHED_PAGES', 'published %d pages')));
  * </code>
  * 
- * @package cms
- * @subpackage batchaction
+ * @package framework
+ * @subpackage admin
  */
 abstract class CMSBatchAction extends Object {
 	
diff --git a/admin/code/CMSBatchActionHandler.php b/admin/code/CMSBatchActionHandler.php
index d3229e694..a8854e662 100644
--- a/admin/code/CMSBatchActionHandler.php
+++ b/admin/code/CMSBatchActionHandler.php
@@ -3,8 +3,8 @@
 /**
  * Special request handler for admin/batchaction
  *  
- * @package cms
- * @subpackage batchaction
+ * @package framework
+ * @subpackage admin
  */
 class CMSBatchActionHandler extends RequestHandler {
 	
diff --git a/admin/code/CMSForm.php b/admin/code/CMSForm.php
index f364ad4ff..ef31e239e 100644
--- a/admin/code/CMSForm.php
+++ b/admin/code/CMSForm.php
@@ -1,6 +1,11 @@
 <?php
+
 /**
- * Deals with special form handling in CMS, mainly around {@link PjaxResponseNegotiator}
+ * Deals with special form handling in CMS, mainly around
+ * {@link PjaxResponseNegotiator}
+ *
+ * @package framework
+ * @subpackage admin
  */
 class CMSForm extends Form {
 
diff --git a/admin/code/CMSPreviewable.php b/admin/code/CMSPreviewable.php
index 63131d0d4..9e4cbb8e9 100644
--- a/admin/code/CMSPreviewable.php
+++ b/admin/code/CMSPreviewable.php
@@ -1,12 +1,15 @@
 <?php
 /**
  * Interface to provide enough information about a record to make it previewable
- * through the CMS. It uses the record database ID, its "frontend" and "backend" links
- * to link up the edit form with its preview. 
+ * through the CMS. It uses the record database ID, its "frontend" and "backend"
+ * links to link up the edit form with its preview.
  * 
- * Also used by {@link SilverStripeNavigator} to generate links - 
- * both within the CMS preview, and as a frontend utility 
- * for logged-in CMS authors in custom themes (with the $SilverStripeNavigator template marker).
+ * Also used by {@link SilverStripeNavigator} to generate links -  both within
+ * the CMS preview, and as a frontend utility for logged-in CMS authors in
+ * custom themes (with the $SilverStripeNavigator template marker).
+ *
+ * @package framework
+ * @subpackage admin
  */
 interface CMSPreviewable {
 	
@@ -17,8 +20,9 @@ interface CMSPreviewable {
 	public function Link();
 	
 	/**
-	 * @return String Absolute URL to the CMS-author view. Should point to a controller subclassing {@link LeftAndMain}.
-	 * Example: http://mysite.com/admin/edit/6
+	 * @return String Absolute URL to the CMS-author view. Should point to a
+	 * controller subclassing {@link LeftAndMain}. Example:
+	 * http://mysite.com/admin/edit/6
 	 */
 	public function CMSEditLink();
 
diff --git a/admin/code/CMSProfileController.php b/admin/code/CMSProfileController.php
index e1b776541..2d751dbd1 100644
--- a/admin/code/CMSProfileController.php
+++ b/admin/code/CMSProfileController.php
@@ -1,4 +1,9 @@
 <?php
+
+/**
+ * @package framework
+ * @subpackage admin
+ */
 class CMSProfileController extends LeftAndMain {
 
 	private static $url_segment = 'myprofile';
@@ -22,18 +27,21 @@ class CMSProfileController extends LeftAndMain {
 		$this->setCurrentPageID(Member::currentUserID());
 
 		$form = parent::getEditForm($id, $fields);
-		if($form instanceof SS_HTTPResponse) return $form;
 		
+		if($form instanceof SS_HTTPResponse) {
+			return $form;
+		}
 		$form->Fields()->removeByName('LastVisited');
 		$form->Fields()->push(new HiddenField('ID', null, Member::currentUserID()));
+		$form->setValidator(new Member_Validator());
 		$form->Actions()->push(
 			FormAction::create('save',_t('CMSMain.SAVE', 'Save'))
 				->addExtraClass('ss-ui-button ss-ui-action-constructive')
 				->setAttribute('data-icon', 'accept')
 				->setUseButtonTag(true)
 		);
+
 		$form->Actions()->removeByName('action_delete');
-		$form->setValidator(new Member_Validator());
 		$form->setTemplate('Form');
 		$form->setAttribute('data-pjax-fragment', null);
 		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
diff --git a/admin/code/GroupImportForm.php b/admin/code/GroupImportForm.php
index e4271f002..a544e8373 100644
--- a/admin/code/GroupImportForm.php
+++ b/admin/code/GroupImportForm.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * Imports {@link Group} records by CSV upload, as defined in
  * {@link GroupCsvBulkLoader}.
  * 
- * @package cms
- * @subpackage batchactions
+ * @package framework
+ * @subpackage admin
  */
 class GroupImportForm extends Form {
 	
diff --git a/admin/code/LeftAndMainExtension.php b/admin/code/LeftAndMainExtension.php
index 5d632bb40..33ca92ad4 100644
--- a/admin/code/LeftAndMainExtension.php
+++ b/admin/code/LeftAndMainExtension.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Plug-ins for additional functionality in your LeftAndMain classes.
  * 
diff --git a/admin/code/MemberImportForm.php b/admin/code/MemberImportForm.php
index d47fbc901..02e5d73f3 100644
--- a/admin/code/MemberImportForm.php
+++ b/admin/code/MemberImportForm.php
@@ -1,10 +1,11 @@
 <?php
+
 /**
  * Imports {@link Member} records by CSV upload, as defined in
  * {@link MemberCsvBulkLoader}.
  * 
- * @package cms
- * @subpackage batchactions
+ * @package framework
+ * @subpackage admin
  */
 class MemberImportForm extends Form {
 	
diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index 655264cc6..9a89badd1 100755
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -1,8 +1,10 @@
 <?php
+
 /**
  * Security section of the CMS
- * @package cms
- * @subpackage security
+ *
+ * @package framework
+ * @subpackage admin
  */
 class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
@@ -60,7 +62,10 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		
 		// TODO Duplicate record fetching (see parent implementation)
 		$record = $this->getRecord($id);
-		if($record && !$record->canView()) return Security::permissionFailure($this);
+
+		if($record && !$record->canView()) {
+			return Security::permissionFailure($this);
+		}
 		
 		$memberList = GridField::create(
 			'Members',