diff --git a/Web/Membership/CodeFirstMembershipProvider.cs b/Web/Membership/CodeFirstMembershipProvider.cs
index c536abb..a035f56 100644
--- a/Web/Membership/CodeFirstMembershipProvider.cs
+++ b/Web/Membership/CodeFirstMembershipProvider.cs
@@ -391,25 +391,25 @@ namespace MileageTraker.Web.Membership
 		public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize,
 		                                                         out int totalRecords)
 		{
-			var MembershipUsers = new MembershipUserCollection();
-			using (var Context = new MileageTrakerContext())
+			var membershipUsers = new MembershipUserCollection();
+			using (var context = new MileageTrakerContext())
 			{
-				totalRecords = Context.Users.Where(Usr => Usr.Username == usernameToMatch).Count();
-				var Users =
-					Context.Users.Where(Usr => Usr.Username == usernameToMatch)
-					       .OrderBy(Usrn => Usrn.Username)
+				totalRecords = context.Users.Count(Usr => Usr.Username == usernameToMatch);
+				var users =
+					context.Users.Where(usr => usr.Username == usernameToMatch)
+					       .OrderBy(usrn => usrn.Username)
 					       .Skip(pageIndex*pageSize)
 					       .Take(pageSize);
-				foreach (var user in Users)
+				foreach (var user in users)
 				{
-					MembershipUsers.Add(new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId,
+					membershipUsers.Add(new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId,
 					                                       user.Email, null, null,
 					                                       user.IsApproved, user.IsLockedOut, user.CreateDate.Value,
 					                                       user.LastLoginDate.Value, user.LastActivityDate.Value,
 					                                       user.LastPasswordChangedDate.Value, user.LastLockoutDate.Value));
 				}
 			}
-			return MembershipUsers;
+			return membershipUsers;
 		}
 
 		public override MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords)
@@ -449,9 +449,9 @@ namespace MileageTraker.Web.Membership
 				throw new MembershipCreateUserException(MembershipCreateStatus.InvalidPassword);
 			}
 
-			using (var Context = new MileageTrakerContext())
+			using (var context = new MileageTrakerContext())
 			{
-				if (Context.Users.Where(Usr => Usr.Username == userName).Any())
+				if (context.Users.Any(Usr => Usr.Username == userName))
 				{
 					throw new MembershipCreateUserException(MembershipCreateStatus.DuplicateUserName);
 				}
@@ -480,8 +480,8 @@ namespace MileageTraker.Web.Membership
 						ConfirmationToken = token
 					};
 
-				Context.Users.Add(NewUser);
-				Context.SaveChanges();
+				context.Users.Add(NewUser);
+				context.SaveChanges();
 				return token;
 			}
 		}