diff --git a/sharkbite.thresher/UserInfo.cs b/sharkbite.thresher/UserInfo.cs
index e13e3956d..2e8d9cfe5 100644
--- a/sharkbite.thresher/UserInfo.cs
+++ b/sharkbite.thresher/UserInfo.cs
@@ -36,74 +36,32 @@ namespace Sharkbite.Irc
 		private readonly string hostName;
 		private static readonly UserInfo EmptyInstance = new UserInfo();
 
-		/// <summary>
-		/// Creat an empty instance
-		/// </summary>
-		private UserInfo() 
-		{
-			nickName = "";
-			userName = "";
-			hostName = "";
+		/// <summary> Creates an empty instance </summary>
+		private UserInfo() {
+			nickName = ""; userName = ""; hostName = "";
 		}
-		/// <summary>
-		/// Create a new UserInfo and set all its values.
-		/// </summary>
-		public UserInfo(string nick, string name, string host) 
-		{
-			nickName = nick;
-			userName = name;
-			hostName = host;
+		
+		/// <summary> Create a new UserInfo and set all its values. </summary>
+		public UserInfo(string nick, string name, string host)  {
+			nickName = nick; userName = name; hostName = host;
 		}
 
-		/// <summary>
-		/// An IRC user's nick name.
-		/// </summary>
-		public string Nick
-		{
-			get 
-			{
-				return nickName;
-			}
-		}
-		/// <summary>
-		/// An IRC user's system username.
-		/// </summary>
-		public string User
-		{
-			get
-			{
-				return userName;
-			}
-		}
-		/// <summary>
-		/// The hostname of the IRC user's machine.
-		/// </summary>
-		public string Hostname 
-		{
-			get 
-			{
-				return hostName;
-			}
-		}
-		/// <summary>
-		/// A singleton blank instance of UserInfo used when an instance is required
+		/// <summary> An IRC user's nick name. </summary>
+		public string Nick { get { return nickName;	} }
+		
+		/// <summary> An IRC user's system username. </summary>
+		public string User { get { return userName; } }
+		
+		/// <summary> The hostname of the IRC user's machine. </summary>
+		public string Hostname { get { return hostName; } }
+		
+		/// <summary> A singleton blank instance of UserInfo used when an instance is required
 		/// by a method signature but no infomation is available, e.g. the last reply
-		/// from a Who request.
-		/// </summary>
-		public static UserInfo Empty 
-		{
-			get
-			{
-				return EmptyInstance;
-			}
-		}
+		/// from a Who request. </summary>
+		public static UserInfo Empty { get { return EmptyInstance; } }
 
-		/// <summary>
-		/// A string representation of this object which
-		/// shows all its values.
-		/// </summary>
-		public override string ToString() 
-		{
+		/// <summary> A string representation of this object which shows all its values. </summary>
+		public override string ToString() {
 			return string.Format("Nick={0} User={1} Host={2}", Nick, User, Hostname ); 
 		}
 	}