diff --git a/NetAF/Assets/Interaction/Condition.cs b/NetAF/Assets/Condition.cs
similarity index 82%
rename from NetAF/Assets/Interaction/Condition.cs
rename to NetAF/Assets/Condition.cs
index 21f93ff3..966c322c 100644
--- a/NetAF/Assets/Interaction/Condition.cs
+++ b/NetAF/Assets/Condition.cs
@@ -1,4 +1,4 @@
-namespace NetAF.Assets.Interaction
+namespace NetAF.Assets
 {
     /// <summary>
     /// Represents a callback for conditions.
diff --git a/NetAF/Assets/ConditionalDescription.cs b/NetAF/Assets/ConditionalDescription.cs
index 54b2ccea..35ff5272 100644
--- a/NetAF/Assets/ConditionalDescription.cs
+++ b/NetAF/Assets/ConditionalDescription.cs
@@ -1,6 +1,4 @@
-using NetAF.Assets.Interaction;
-
-namespace NetAF.Assets
+namespace NetAF.Assets
 {
     /// <summary>
     /// Represents a conditional description of an object.
diff --git a/NetAF/Assets/ExaminationResult.cs b/NetAF/Assets/ExaminationResult.cs
index 6628318d..16a92465 100644
--- a/NetAF/Assets/ExaminationResult.cs
+++ b/NetAF/Assets/ExaminationResult.cs
@@ -7,16 +7,13 @@ namespace NetAF.Assets
     /// </summary>
     public class ExaminationResult : Result
     {
-        #region Methods
+        #region Constructors
 
         /// <summary>
         /// Initializes a new instance of the ExaminationResult class.
         /// </summary>
         /// <param name="description">A description of the result.</param>
-        public ExaminationResult(string description)
-        {
-            Description = description;
-        }
+        public ExaminationResult(string description) => Description = description;
 
         #endregion
     }
diff --git a/NetAF/Utilities/StringUtilities.cs b/NetAF/Utilities/StringUtilities.cs
index 2128dcb1..65c1c726 100644
--- a/NetAF/Utilities/StringUtilities.cs
+++ b/NetAF/Utilities/StringUtilities.cs
@@ -12,6 +12,8 @@ namespace NetAF.Utilities
     /// </summary>
     public static class StringUtilities
     {
+        #region Constants
+
         /// <summary>
         /// Get the new line string.
         /// </summary>
@@ -27,6 +29,10 @@ public static class StringUtilities
         /// </summary>
         public const char CR = (char)13;
 
+        #endregion
+        
+        #region StaticMethods
+
         /// <summary>
         /// Preen input to remove any ambiguity around special characters.
         /// </summary>
@@ -169,5 +175,7 @@ public static string ConstructAttributesAsString(Dictionary<Attribute, int> attr
 
             return builder.ToString();
         }
+
+        #endregion
     }
 }