diff --git a/groups b/groups
index c37ab81..39ce56e 100644
--- a/groups
+++ b/groups
@@ -13,5 +13,4 @@
 global:Project-Owners                   	Project Owners
 global:Registered-Users                 	Registered Users
 user:bocon                              	user/Brian O'Connor (bocon)
-user:cloudlab                           	user/Cloud Lab (cloudlab)
 user:hwchiu                             	user/HungWei Chiu (hwchiu)
diff --git a/project.config b/project.config
index 4b1c88c..cb108f4 100644
--- a/project.config
+++ b/project.config
@@ -11,14 +11,6 @@
 	rejectImplicitMerges = true
 [submit]
 	mergeContent = true
-[capability]
-	administrateServer = group Administrators
-	priority = batch group Non-Interactive Users
-	streamEvents = group Non-Interactive Users
-	accessDatabase = group user/Brian O'Connor (bocon)
-	accessDatabase = group user/HungWei Chiu (hwchiu)
-	modifyAccount = group Administrators
-	viewAllAccounts = group Administrators
 [access "refs/*"]
 	read = deny group GitHub Replication - Open-Cloud
 	read = deny group GitHub Replication - OpenCord
@@ -51,6 +43,7 @@
 	publishDrafts = block group Read-only Users
 	createTag = block group Read-only Users
 	createSignedTag = block group Read-only Users
+	revert = group Registered Users
 [access "refs/heads/*"]
 	create = group Administrators
 	create = group Project Owners
@@ -104,13 +97,13 @@
 	copyAllScoresOnTrivialRebase = true
 	value = -2 This shall not be merged
 	value = -1 I would prefer this is not merged as is
-	value =  0 No score
+	value = 0 No score
 	value = +1 Looks good to me, but someone else must approve
 	value = +2 Looks good to me, approved
 [label "Verified"]
     function = MaxWithBlock
     value = -1 Fails
-    value =  0 No score
+    value = 0 No score
     value = +1 Verified
 	defaultValue = 0
 [access "refs/drafts/*"]
@@ -121,15 +114,23 @@
 	forgeAuthor = group Project Owners
 	push = group Administrators
 	push = group Registered Users
-[contributor-agreement "Individual"]
-       description = If you are going to be contributing code on your own, please sign this CLA. You can sign this one online.
-       agreementUrl = static/cla.html
-       autoVerify = group ONF CLA Accepted
-       accepted = group ONF CLA Accepted
 [access "refs/for/*"]
 	addPatchSet = group Registered Users
 [access "refs/for/refs/meta/config"]
 	push = group Administrators
+[contributor-agreement "Individual"]
+	description = If you are going to be contributing code on your own, please sign this CLA. You can sign this one online.
+	agreementUrl = static/cla.html
+	autoVerify = group ONF CLA Accepted
+	accepted = group ONF CLA Accepted
+[capability]
+	accessDatabase = group user/Brian O'Connor (bocon)
+	accessDatabase = group user/HungWei Chiu (hwchiu)
+	administrateServer = group Administrators
+	modifyAccount = group Administrators
+	priority = batch group Non-Interactive Users
+	streamEvents = group Non-Interactive Users
+	viewAllAccounts = group Administrators
 [plugin "reviewers-by-blame"]
 	ignoreDrafts = true
 	maxReviewers = 3