diff --git a/tasks.py b/tasks.py
index e45683d3e2..145983154c 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1144,7 +1144,11 @@ def ci_build(
                     "id": None,
                 }
 
-            novelty_thor_add_branches = ["new_cam_adjust", "stretch_with_many_cameras"]
+            novelty_thor_add_branches = [
+                "new_cam_adjust",
+                "stretch_with_many_cameras",
+                "stretch_with_many_cameras_no_down_gopro_roll",
+            ]
             if is_travis_build and build and build["branch"] in novelty_thor_add_branches:
                 novelty_thor_scenes = True
                 private_repos.append(novelty_thor_repo)
diff --git a/unity/Assets/Scripts/ActionDispatcher.cs b/unity/Assets/Scripts/ActionDispatcher.cs
index 6c06f841ba..966ca60a67 100644
--- a/unity/Assets/Scripts/ActionDispatcher.cs
+++ b/unity/Assets/Scripts/ActionDispatcher.cs
@@ -7,8 +7,7 @@
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 
-public class ActionFinished
-{
+public class ActionFinished {
     public bool success;
     public object actionReturn;
     public string errorMessage;
@@ -28,8 +27,7 @@ public ActionFinished(
         bool toEmitState = false,
         ServerActionErrorCode errorCode = 0,
         bool isDummy = false
-    )
-    {
+    ) {
         this.success = success;
         this.actionReturn = actionReturn;
         this.errorMessage = errorMessage;
@@ -38,8 +36,7 @@ public ActionFinished(
         this.isDummy = isDummy;
     }
 
-    public ActionFinished(ActionFinished toCopy)
-    {
+    public ActionFinished(ActionFinished toCopy) {
         this.success = toCopy.success;
         this.actionReturn = toCopy.actionReturn;
         this.errorMessage = toCopy.errorMessage;
@@ -51,14 +48,12 @@ public ActionFinished(ActionFinished toCopy)
     public static ActionFinished Success = new ActionFinished() { success = true };
     public static ActionFinished Fail = new ActionFinished() { success = false };
 
-    public static ActionFinished SuccessToEmitState = new ActionFinished()
-    {
+    public static ActionFinished SuccessToEmitState = new ActionFinished() {
         success = true,
         toEmitState = true
     };
 
-    public IEnumerator GetEnumerator()
-    {
+    public IEnumerator GetEnumerator() {
         yield return this;
     }
 }
@@ -70,8 +65,7 @@ public IEnumerator GetEnumerator()
 //     }
 // }
 
-public interface ActionInvokable
-{
+public interface ActionInvokable {
     void Complete(ActionFinished actionFinished);
     Coroutine StartCoroutine(System.Collections.IEnumerator routine);
 }
@@ -153,8 +147,7 @@ public void LookUp(float degrees, bool forceThing)
             value for forceThing.
 
 */
-public static class ActionDispatcher
-{
+public static class ActionDispatcher {
     private static Dictionary<Type, Dictionary<string, List<MethodInfo>>> allMethodDispatchTable =
         new Dictionary<Type, Dictionary<string, List<MethodInfo>>>();
     private static Dictionary<Type, MethodInfo[]> methodCache =
@@ -162,49 +155,39 @@ public static class ActionDispatcher
 
     // look through all methods on a target type and attempt to get the MethodInfo
     // any ambiguous method will throw an exception.  This is used during testing.
-    public static List<string> FindAmbiguousActions(Type targetType)
-    {
+    public static List<string> FindAmbiguousActions(Type targetType) {
         List<string> actions = new List<string>();
         System.Reflection.MethodInfo[] allMethods = targetType.GetMethods(
             BindingFlags.Public | BindingFlags.Instance
         );
         HashSet<string> methodNames = new HashSet<string>();
-        foreach (var method in allMethods)
-        {
+        foreach (var method in allMethods) {
             methodNames.Add(method.Name);
         }
-        foreach (var methodName in methodNames)
-        {
-            try
-            {
+        foreach (var methodName in methodNames) {
+            try {
                 Dictionary<string, object> act = new Dictionary<string, object>();
                 act["action"] = methodName;
                 DynamicServerAction dynamicServerAction = new DynamicServerAction(act);
                 MethodInfo m = getDispatchMethod(targetType, dynamicServerAction);
-            }
-            catch (AmbiguousActionException)
-            {
+            } catch (AmbiguousActionException) {
                 actions.Add(methodName);
             }
         }
         return actions;
     }
 
-    private static MethodInfo[] getMethods(Type targetType)
-    {
-        if (!methodCache.ContainsKey(targetType))
-        {
+    private static MethodInfo[] getMethods(Type targetType) {
+        if (!methodCache.ContainsKey(targetType)) {
             var methods = new List<MethodInfo>();
             foreach (
                 MethodInfo mi in targetType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
-            )
-            {
+            ) {
                 if (
                     mi.ReturnType == typeof(void)
                     || mi.ReturnType == typeof(ActionFinished)
                     || mi.ReturnType == typeof(IEnumerator)
-                )
-                {
+                ) {
                     methods.Add(mi);
                 }
             }
@@ -217,48 +200,39 @@ MethodInfo mi in targetType.GetMethods(BindingFlags.Public | BindingFlags.Instan
     // Find public/void methods that have matching Method names and identical parameter names,
     // but either different parameter order or parameter types which make dispatching
     // ambiguous. This method is used during testing to find conflicts.
-    public static Dictionary<string, List<string>> FindMethodVariableNameConflicts(Type targetType)
-    {
+    public static Dictionary<string, List<string>> FindMethodVariableNameConflicts(Type targetType) {
         MethodInfo[] allMethods = getMethods(targetType);
         Dictionary<string, List<string>> methodConflicts = new Dictionary<string, List<string>>();
 
-        for (int i = 0; i < allMethods.Length - 1; i++)
-        {
+        for (int i = 0; i < allMethods.Length - 1; i++) {
             MethodInfo methodOut = allMethods[i];
             HashSet<string> paramSet = new HashSet<string>();
             ParameterInfo[] methodOutParams = methodOut.GetParameters();
-            foreach (var p in methodOutParams)
-            {
+            foreach (var p in methodOutParams) {
                 paramSet.Add(p.Name);
             }
-            for (int j = i + 1; j < allMethods.Length; j++)
-            {
+            for (int j = i + 1; j < allMethods.Length; j++) {
                 MethodInfo methodIn = allMethods[j];
                 ParameterInfo[] methodInParams = allMethods[j].GetParameters();
                 if (
                     methodIn.Name == methodOut.Name
                     && methodOutParams.Length == methodInParams.Length
-                )
-                {
+                ) {
                     bool allVariableNamesMatch = true;
                     bool allParamsMatch = true;
-                    for (int k = 0; k < methodInParams.Length; k++)
-                    {
+                    for (int k = 0; k < methodInParams.Length; k++) {
                         var mpIn = methodInParams[k];
                         var mpOut = methodOutParams[k];
                         // we assume the method is overriding if everything matches
-                        if (mpIn.Name != mpOut.Name || mpOut.ParameterType != mpIn.ParameterType)
-                        {
+                        if (mpIn.Name != mpOut.Name || mpOut.ParameterType != mpIn.ParameterType) {
                             allParamsMatch = false;
                         }
-                        if (!paramSet.Contains(mpIn.Name))
-                        {
+                        if (!paramSet.Contains(mpIn.Name)) {
                             allVariableNamesMatch = false;
                             break;
                         }
                     }
-                    if (allVariableNamesMatch && !allParamsMatch)
-                    {
+                    if (allVariableNamesMatch && !allParamsMatch) {
                         methodConflicts[methodOut.Name] = new List<string>(paramSet);
                     }
                 }
@@ -267,39 +241,32 @@ public static Dictionary<string, List<string>> FindMethodVariableNameConflicts(T
         return methodConflicts;
     }
 
-    private static Dictionary<string, List<MethodInfo>> getMethodDispatchTable(Type targetType)
-    {
-        if (!allMethodDispatchTable.ContainsKey(targetType))
-        {
+    private static Dictionary<string, List<MethodInfo>> getMethodDispatchTable(Type targetType) {
+        if (!allMethodDispatchTable.ContainsKey(targetType)) {
             allMethodDispatchTable[targetType] = new Dictionary<string, List<MethodInfo>>();
         }
 
         return allMethodDispatchTable[targetType];
     }
 
-    private static List<MethodInfo> getCandidateMethods(Type targetType, string action)
-    {
+    private static List<MethodInfo> getCandidateMethods(Type targetType, string action) {
         Dictionary<string, List<MethodInfo>> methodDispatchTable = getMethodDispatchTable(
             targetType
         );
-        if (!methodDispatchTable.ContainsKey(action))
-        {
+        if (!methodDispatchTable.ContainsKey(action)) {
             List<MethodInfo> methods = new List<MethodInfo>();
 
             List<Type> hierarchy = new List<Type>();
 
             // not completely generic
             Type ht = targetType;
-            while (ht != typeof(object))
-            {
+            while (ht != typeof(object)) {
                 hierarchy.Add(ht);
                 ht = ht.BaseType;
             }
 
-            foreach (MethodInfo mi in getMethods(targetType))
-            {
-                if (mi.Name != action)
-                {
+            foreach (MethodInfo mi in getMethods(targetType)) {
+                if (mi.Name != action) {
                     continue;
                 }
                 bool replaced = false;
@@ -309,15 +276,12 @@ private static List<MethodInfo> getCandidateMethods(Type targetType, string acti
                 // are not used
                 ParameterInfo[] sourceParams = mi.GetParameters();
 
-                for (int j = 0; j < methods.Count && !replaced; j++)
-                {
+                for (int j = 0; j < methods.Count && !replaced; j++) {
                     bool signatureMatch = true;
                     ParameterInfo[] targetParams = methods[j].GetParameters();
                     int minCommon = Math.Min(sourceParams.Length, targetParams.Length);
-                    for (int k = 0; k < minCommon; k++)
-                    {
-                        if (sourceParams[k].ParameterType != targetParams[k].ParameterType)
-                        {
+                    for (int k = 0; k < minCommon; k++) {
+                        if (sourceParams[k].ParameterType != targetParams[k].ParameterType) {
                             signatureMatch = false;
                             break;
                         }
@@ -326,26 +290,21 @@ private static List<MethodInfo> getCandidateMethods(Type targetType, string acti
                     if (
                         sourceParams.Length > targetParams.Length
                         && !sourceParams[minCommon].HasDefaultValue
-                    )
-                    {
+                    ) {
                         signatureMatch = false;
-                    }
-                    else if (
-                        targetParams.Length > sourceParams.Length
-                        && !targetParams[minCommon].HasDefaultValue
-                    )
-                    {
+                    } else if (
+                          targetParams.Length > sourceParams.Length
+                          && !targetParams[minCommon].HasDefaultValue
+                      ) {
                         signatureMatch = false;
                     }
 
                     // if the method is more specific and the parameters match
                     // we will dispatch to this method instead of the base type
-                    if (signatureMatch)
-                    {
+                    if (signatureMatch) {
                         // this happens if one method has a trailing optional value and all
                         // other parameter types match
-                        if (targetParams.Length != sourceParams.Length)
-                        {
+                        if (targetParams.Length != sourceParams.Length) {
                             // TODO: This designation is based on ordered argument call assumption, which is not true for DynamicServerActions
                             // which are always passed as named arguments, order does not matter, Ambiguity should be determined on actual call
                             // not on method signatures
@@ -358,15 +317,13 @@ private static List<MethodInfo> getCandidateMethods(Type targetType, string acti
                         if (
                             hierarchy.IndexOf(mi.DeclaringType)
                             < hierarchy.IndexOf(methods[j].DeclaringType)
-                        )
-                        {
+                        ) {
                             methods[j] = mi;
                         }
                     }
                 }
 
-                if (!replaced)
-                {
+                if (!replaced) {
                     // we sort the list of methods so that we evaluate
                     // methods with fewer and possible no params first
                     // and then match methods with greater params
@@ -387,8 +344,7 @@ private static List<MethodInfo> getCandidateMethods(Type targetType, string acti
     public static MethodInfo getDispatchMethod(
         Type targetType,
         DynamicServerAction dynamicServerAction
-    )
-    {
+    ) {
         List<MethodInfo> actionMethods = getCandidateMethods(
             targetType,
             dynamicServerAction.action
@@ -402,8 +358,7 @@ DynamicServerAction dynamicServerAction
         // variable names.  In the future, this could be modified to include type information from
         // the inbound JSON object by mapping JSON types to csharp primitive types
         // (i.e. number -> [short, float, int], bool -> bool, string -> string, dict -> object, list -> list)
-        foreach (var method in actionMethods)
-        {
+        foreach (var method in actionMethods) {
             int matchCount = 0;
             ParameterInfo[] mParams = method.GetParameters();
 
@@ -424,8 +379,7 @@ DynamicServerAction dynamicServerAction
 
             // Throw the exception only if there are more than one methods at the same childmost class level,
             // if not, the child most method will be chosen so there is no ambiguity
-            if (serverActionMethods.Count() > 0 && childMostTypeMethods.Count() > 1)
-            {
+            if (serverActionMethods.Count() > 0 && childMostTypeMethods.Count() > 1) {
                 throw new AmbiguousActionException(
                     $"Mixing a ServerAction method with overloaded methods is not permitted. Ambiguous methods: {string.Join(" | ", serverActionMethods.Select(m => $"method: {m.method.Name} in class '{m.method.DeclaringType}' with params {$"{string.Join(", ", m.parameters.Select(p => $"{p.ParameterType} {p.Name}"))}"}"))}"
                 );
@@ -444,16 +398,11 @@ DynamicServerAction dynamicServerAction
                 matchedMethod == null
                 && mParams.Length == 1
                 && mParams[0].ParameterType == typeof(ServerAction)
-            )
-            {
+            ) {
                 matchedMethod = method;
-            }
-            else
-            {
-                foreach (var p in method.GetParameters())
-                {
-                    if (dynamicServerAction.ContainsKey(p.Name))
-                    {
+            } else {
+                foreach (var p in method.GetParameters()) {
+                    if (dynamicServerAction.ContainsKey(p.Name)) {
                         matchCount++;
                     }
                 }
@@ -473,8 +422,7 @@ DynamicServerAction dynamicServerAction
                     && isSubclassOfBestMatchDeclaringType
                     && matchedMethod.DeclaringType != method.DeclaringType
                 )
-            )
-            {
+            ) {
                 // TODO: decide if this check should be added, or we want whatever method ranked top by 'MethodParamComparer' to be chosen (based on param number and default params)
                 // if (matchedMethod.DeclaringType == method.DeclaringType) {
                 //     // if matchcount is the same between any two methods and same level of inheritance hierarchy throw ambiguous exeption, since no method
@@ -492,8 +440,7 @@ DynamicServerAction dynamicServerAction
     public static IEnumerable<MethodInfo> getMatchingMethodOverwrites(
         Type targetType,
         DynamicServerAction dynamicServerAction
-    )
-    {
+    ) {
         return getCandidateMethods(targetType, dynamicServerAction.action)
             .Select(method =>
                 (
@@ -508,12 +455,10 @@ DynamicServerAction dynamicServerAction
     }
 
     public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction)
-        where T : ActionInvokable
-    {
+        where T : ActionInvokable {
         MethodInfo method = getDispatchMethod(target.GetType(), dynamicServerAction);
 
-        if (method == null)
-        {
+        if (method == null) {
             throw new InvalidActionException();
         }
 
@@ -541,29 +486,23 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
                 typeof(IEnumerator) == method.ReturnType
                 || method.ReturnType == typeof(ActionFinished)
             )
-        )
-        {
+        ) {
             // New action types always pass down physicsSim params if interface has them
-            if (paramDict.ContainsKey(DynamicServerAction.physicsSimulationParamsVariable))
-            {
+            if (paramDict.ContainsKey(DynamicServerAction.physicsSimulationParamsVariable)) {
                 dynamicServerAction.AddPhysicsSimulationParams(physicsSimulationParams);
             }
         }
         // TODO: deprecate, eventually when no void actions are left
-        if (methodParams.Length == 1 && methodParams[0].ParameterType == typeof(ServerAction))
-        {
+        if (methodParams.Length == 1 && methodParams[0].ParameterType == typeof(ServerAction)) {
             ServerAction serverAction = dynamicServerAction.ToObject<ServerAction>();
             serverAction.dynamicServerAction = dynamicServerAction;
             arguments[0] = serverAction;
-        }
-        else
-        {
+        } else {
             var argumentKeys = dynamicServerAction.ArgumentKeys().ToList();
             var invalidArgs = argumentKeys
                 .Where(argName => !paramDict.ContainsKey(argName))
                 .ToList();
-            if (invalidArgs.Count > 0)
-            {
+            if (invalidArgs.Count > 0) {
                 Func<ParameterInfo, string> paramToString = (ParameterInfo param) =>
                     $"{param.ParameterType.Name} {param.Name}{(param.HasDefaultValue ? " = " + param.DefaultValue : "")}";
                 var matchingMethodOverWrites = getMatchingMethodOverwrites(
@@ -583,19 +522,14 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
                     matchingMethodOverWrites
                 );
             }
-            for (int i = 0; i < methodParams.Length; i++)
-            {
+            for (int i = 0; i < methodParams.Length; i++) {
                 System.Reflection.ParameterInfo pi = methodParams[i];
-                if (dynamicServerAction.ContainsKey(pi.Name))
-                {
-                    try
-                    {
+                if (dynamicServerAction.ContainsKey(pi.Name)) {
+                    try {
                         arguments[i] = dynamicServerAction
                             .GetValue(pi.Name)
                             .ToObject(pi.ParameterType);
-                    }
-                    catch (ArgumentException ex)
-                    {
+                    } catch (ArgumentException ex) {
                         throw new ToObjectArgumentActionException(
                             parameterName: pi.Name,
                             parameterType: pi.ParameterType,
@@ -603,13 +537,9 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
                             ex: ex
                         );
                     }
-                }
-                else
-                {
-                    if (!pi.HasDefaultValue)
-                    {
-                        if (missingArguments == null)
-                        {
+                } else {
+                    if (!pi.HasDefaultValue) {
+                        if (missingArguments == null) {
                             missingArguments = new List<string>();
                         }
                         missingArguments.Add(pi.Name);
@@ -618,8 +548,7 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
                 }
             }
         }
-        if (missingArguments != null)
-        {
+        if (missingArguments != null) {
             throw new MissingArgumentsActionException(missingArguments);
         }
 
@@ -627,39 +556,30 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
         object methodReturn;
 
         // TODO: deprecated actions called in the old way that return void
-        if (!usePhysicsSimulationParams && method.ReturnType == typeof(void))
-        {
+        if (!usePhysicsSimulationParams && method.ReturnType == typeof(void)) {
             method.Invoke(target, arguments);
-        }
-        else
-        {
+        } else {
             // Only IEnumerators return functions can be run in a coroutine
             var runAsCoroutine = false;
 
-            if (method.ReturnType == typeof(System.Collections.IEnumerator))
-            {
+            if (method.ReturnType == typeof(System.Collections.IEnumerator)) {
                 methodReturn = method.Invoke(target, arguments);
                 action = methodReturn as IEnumerator;
                 runAsCoroutine = physicsSimulationParams.autoSimulation;
-            }
-            else if (method.ReturnType == typeof(ActionFinished))
-            {
+            } else if (method.ReturnType == typeof(ActionFinished)) {
                 action = ActionFinishedDelayActionWrapper(
                     () => method.Invoke(target, arguments) as ActionFinished
                 );
             }
-            // TODO: when legacy actions are gone remove branch
-            else
-            {
-                action = ActionFinishedDelayActionWrapper(() =>
-                {
+              // TODO: when legacy actions are gone remove branch
+              else {
+                action = ActionFinishedDelayActionWrapper(() => {
                     method.Invoke(target, arguments);
                     // TODO: deprecated void action returns dummy ActionFinished
                     return new ActionFinished() { isDummy = true };
                 });
             }
-            if (!runAsCoroutine)
-            {
+            if (!runAsCoroutine) {
                 // Blocking
                 var actionFinished = PhysicsSceneManager.RunSimulatePhysicsForAction(
                     action,
@@ -667,9 +587,7 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
                 );
                 // Complete callback at action end, implementation should do any state changes
                 target.Complete(actionFinished);
-            }
-            else
-            {
+            } else {
                 // "Async" will run after unity's frame update
                 target.StartCoroutine(
                     PhysicsSceneManager.RunActionForCoroutine(
@@ -682,43 +600,34 @@ public static void Dispatch<T>(T target, DynamicServerAction dynamicServerAction
         }
     }
 
-    public static IEnumerator ActionFinishedWrapper(ActionFinished actionFinished)
-    {
+    public static IEnumerator ActionFinishedWrapper(ActionFinished actionFinished) {
         yield return actionFinished;
     }
 
-    public static IEnumerator ActionFinishedDelayActionWrapper(Func<ActionFinished> action)
-    {
+    public static IEnumerator ActionFinishedDelayActionWrapper(Func<ActionFinished> action) {
         yield return action();
     }
 }
 
-public class MethodParamComparer : IComparer<MethodInfo>
-{
-    public int Compare(MethodInfo a, MethodInfo b)
-    {
+public class MethodParamComparer : IComparer<MethodInfo> {
+    public int Compare(MethodInfo a, MethodInfo b) {
         int requiredParamCountA = requiredParamCount(a);
         int requiredParamCountB = requiredParamCount(b);
         int result = requiredParamCountA.CompareTo(requiredParamCountB);
-        if (result == 0)
-        {
+        if (result == 0) {
             result = paramCount(a).CompareTo(paramCount(b));
         }
         return result;
     }
 
-    private static int paramCount(MethodInfo method)
-    {
+    private static int paramCount(MethodInfo method) {
         return method.GetParameters().Length;
     }
 
-    private static int requiredParamCount(MethodInfo method)
-    {
+    private static int requiredParamCount(MethodInfo method) {
         int count = 0;
-        foreach (var p in method.GetParameters())
-        {
-            if (!p.HasDefaultValue)
-            {
+        foreach (var p in method.GetParameters()) {
+            if (!p.HasDefaultValue) {
                 count++;
             }
         }
@@ -730,22 +639,19 @@ private static int requiredParamCount(MethodInfo method)
 [Serializable]
 public class InvalidActionException : Exception { }
 
-public class InvalidActionCallWithPhysicsSimulationParams : Exception
-{
+public class InvalidActionCallWithPhysicsSimulationParams : Exception {
     public InvalidActionCallWithPhysicsSimulationParams(string message)
         : base(message) { }
 }
 
 [Serializable]
-public class AmbiguousActionException : Exception
-{
+public class AmbiguousActionException : Exception {
     public AmbiguousActionException(string message)
         : base(message) { }
 }
 
 [Serializable]
-public class ToObjectArgumentActionException : Exception
-{
+public class ToObjectArgumentActionException : Exception {
     public string parameterName;
     public ArgumentException innerException;
     public Type parameterType;
@@ -756,8 +662,7 @@ public ToObjectArgumentActionException(
         Type parameterType,
         string parameterValueAsStr,
         ArgumentException ex
-    )
-    {
+    ) {
         this.parameterName = parameterName;
         this.parameterType = parameterType;
         this.parameterValueAsStr = parameterValueAsStr;
@@ -766,19 +671,16 @@ ArgumentException ex
 }
 
 [Serializable]
-public class MissingArgumentsActionException : Exception
-{
+public class MissingArgumentsActionException : Exception {
     public List<string> ArgumentNames;
 
-    public MissingArgumentsActionException(List<string> argumentNames)
-    {
+    public MissingArgumentsActionException(List<string> argumentNames) {
         this.ArgumentNames = argumentNames;
     }
 }
 
 [Serializable]
-public class InvalidArgumentsException : Exception
-{
+public class InvalidArgumentsException : Exception {
     public IEnumerable<string> ArgumentNames;
     public IEnumerable<string> InvalidArgumentNames;
     public IEnumerable<string> ParameterNames;
@@ -789,8 +691,7 @@ public InvalidArgumentsException(
         IEnumerable<string> invalidArgumentNames,
         IEnumerable<string> parameterNames = null,
         IEnumerable<string> possibleOverwrites = null
-    )
-    {
+    ) {
         this.ArgumentNames = argumentNames;
         this.InvalidArgumentNames = invalidArgumentNames;
         this.ParameterNames = parameterNames ?? new List<string>();
@@ -799,8 +700,7 @@ public InvalidArgumentsException(
 }
 
 [Serializable]
-public class MissingActionFinishedException : Exception
-{
+public class MissingActionFinishedException : Exception {
     public MissingActionFinishedException(string message = "")
         : base(message) { }
 }
diff --git a/unity/Assets/Scripts/AgentManager.cs b/unity/Assets/Scripts/AgentManager.cs
index 96653a9767..6dc119e148 100644
--- a/unity/Assets/Scripts/AgentManager.cs
+++ b/unity/Assets/Scripts/AgentManager.cs
@@ -30,8 +30,7 @@
 using UnityEngine.CloudRendering;
 #endif
 
-public class AgentManager : MonoBehaviour, ActionInvokable
-{
+public class AgentManager : MonoBehaviour, ActionInvokable {
     public List<BaseFPSAgentController> agents = new List<BaseFPSAgentController>();
     protected int frameCounter;
     protected bool serverSideScreenshot;
@@ -70,8 +69,7 @@ public class AgentManager : MonoBehaviour, ActionInvokable
     public PhysicsSceneManager physicsSceneManager { get; private set; }
     private FifoServer.Client fifoClient = null;
 
-    private enum serverTypes
-    {
+    private enum serverTypes {
         WSGI,
         FIFO
     };
@@ -103,12 +101,9 @@ private enum serverTypes
     public string agentMode;
 
     public Bounds sceneBounds = UtilityFunctions.CreateEmptyBounds();
-    public Bounds SceneBounds
-    {
-        get
-        {
-            if (sceneBounds.min.x == float.PositiveInfinity)
-            {
+    public Bounds SceneBounds {
+        get {
+            if (sceneBounds.min.x == float.PositiveInfinity) {
                 ResetSceneBounds();
             }
             return sceneBounds;
@@ -116,8 +111,7 @@ public Bounds SceneBounds
         set { sceneBounds = value; }
     }
 
-    void Awake()
-    {
+    void Awake() {
         tex = new Texture2D(
             UnityEngine.Screen.width,
             UnityEngine.Screen.height,
@@ -145,18 +139,15 @@ void Awake()
                 typeof(serverTypes),
                 LoadStringVariable(serverTypes.WSGI.ToString(), "SERVER_TYPE").ToUpper()
             );
-        if (serverType == serverTypes.FIFO)
-        {
+        if (serverType == serverTypes.FIFO) {
             string serverPipePath = LoadStringVariable(null, "FIFO_SERVER_PIPE_PATH");
             string clientPipePath = LoadStringVariable(null, "FIFO_CLIENT_PIPE_PATH");
 
             // TODO: Create dir if not exists
-            if (string.IsNullOrEmpty(serverPipePath))
-            {
+            if (string.IsNullOrEmpty(serverPipePath)) {
                 serverPipePath = "fifo_pipe/server.pipe";
             }
-            if (string.IsNullOrEmpty(clientPipePath))
-            {
+            if (string.IsNullOrEmpty(clientPipePath)) {
                 clientPipePath = "fifo_pipe/client.pipe";
             }
 
@@ -165,8 +156,7 @@ void Awake()
             this.fifoClient = FifoServer.Client.GetInstance(serverPipePath, clientPipePath);
         }
 #if UNITY_EDITOR
-        if (serverType == serverTypes.WSGI)
-        {
+        if (serverType == serverTypes.WSGI) {
             serverSideScreenshot = true;
             print("---ServerSideScreenshot enabled");
         }
@@ -183,8 +173,7 @@ void Awake()
         actionDuration = LoadIntVariable(actionDuration, prefix + "ACTION_LENGTH");
     }
 
-    void Start()
-    {
+    void Start() {
         // default primary agent's agentController type to "PhysicsRemoteFPSAgentController"
         initializePrimaryAgent();
         // primaryAgent.stand
@@ -216,55 +205,37 @@ void Start()
         StartCoroutine(EmitFrame());
     }
 
-    public void Complete(ActionFinished result)
-    {
+    public void Complete(ActionFinished result) {
         this.activeAgent().Complete(result);
     }
 
-    private void initializePrimaryAgent()
-    {
-        if (this.PrimaryAgent == null)
-        {
+    private void initializePrimaryAgent() {
+        if (this.PrimaryAgent == null) {
             SetUpPhysicsController();
         }
     }
 
-    public void Initialize(ServerAction action)
-    {
+    public void Initialize(ServerAction action) {
         this.agentMode = action.agentMode.ToLower();
         // first parse agentMode and agentControllerType
         //"default" agentMode can use either default or "stochastic" agentControllerType
         //"locobot" agentMode can use either default or "stochastic" agentControllerType
         //"drone" agentMode can ONLY use "drone" agentControllerType, and NOTHING ELSE (for now?)
-        if (action.agentMode.ToLower() == "default")
-        {
+        if (action.agentMode.ToLower() == "default") {
             SetUpPhysicsController();
-        }
-        else if (action.agentMode.ToLower() == "locobot")
-        {
+        } else if (action.agentMode.ToLower() == "locobot") {
             // LocobotController is a subclass of Stochastic which just the agentMode (VisibilityCapsule) changed
             SetUpLocobotController(action);
-        }
-        else if (action.agentMode.ToLower() == "drone")
-        {
+        } else if (action.agentMode.ToLower() == "drone") {
             SetUpDroneController(action);
-        }
-        else if (agentMode == "stretch" || agentMode == "arm" || agentMode == "stretchab")
-        {
-            if (agentMode == "stretch")
-            {
+        } else if (agentMode == "stretch" || agentMode == "arm" || agentMode == "stretchab") {
+            if (agentMode == "stretch") {
                 SetUpStretchController(action);
-            }
-            else if (agentMode == "arm")
-            {
+            } else if (agentMode == "arm") {
                 SetUpArmController(true);
-            }
-            else if (agentMode == "stretchab")
-            {
+            } else if (agentMode == "stretchab") {
                 SetUpStretchABController(action);
-            }
-            else
-            {
+            } else {
                 // Should not be possible but being very defensive.
                 throw new ArgumentException($"Invalid agentMode {action.agentMode}");
             }
@@ -276,9 +247,7 @@ public void Initialize(ServerAction action)
             // }
 
             physicsSceneManager.MakeAllObjectsMoveable();
-        }
-        else if (agentMode == "fpin")
-        {
+        } else if (agentMode == "fpin") {
             SetUpFpinController(action);
 
             // TODO refactor initialization funtionality
@@ -313,8 +282,7 @@ public void Initialize(ServerAction action)
             Debug.Log(
                 $"BackwardsCompatibleInitialize of AgentController. lastActionSuccess: {actionFinished.success}, errorMessage: {actionFinished.errorMessage} actionReturn: {actionFinished.actionReturn}, agentState: {primaryAgent.agentState}"
             );
-            if (!actionFinished.success)
-            {
+            if (!actionFinished.success) {
                 primaryAgent.actionFinished(
                     false,
                     $"Error running 'BackwardsCompatibleInitialize' failed with error: {actionFinished.errorMessage}"
@@ -323,23 +291,17 @@ public void Initialize(ServerAction action)
             }
             // if (actiongF)
             // actionFinished.
-        }
-        else
-        {
+        } else {
             var error = $"Invalid agentMode {action.agentMode}";
             Debug.Log(error);
             primaryAgent.actionFinished(success: false, errorMessage: error);
             return;
         }
 
-        if (action.massThreshold.HasValue)
-        {
-            if (action.massThreshold.Value > 0.0)
-            {
+        if (action.massThreshold.HasValue) {
+            if (action.massThreshold.Value > 0.0) {
                 SetUpMassThreshold(action.massThreshold.Value);
-            }
-            else
-            {
+            } else {
                 var error =
                     $"massThreshold must have nonzero value - invalid value: {action.massThreshold.Value}";
                 Debug.Log(error);
@@ -361,8 +323,7 @@ public void Initialize(ServerAction action)
             $"Initialize of AgentController. lastActionSuccess: {primaryAgent.lastActionSuccess}, errorMessage: {primaryAgent.errorMessage}, actionReturn: {primaryAgent.actionReturn}, agentState: {primaryAgent.agentState}"
         );
         Time.fixedDeltaTime = action.fixedDeltaTime.GetValueOrDefault(Time.fixedDeltaTime);
-        if (action.targetFrameRate > 0)
-        {
+        if (action.targetFrameRate > 0) {
             Application.targetFrameRate = action.targetFrameRate;
         }
 
@@ -386,8 +347,7 @@ public void Initialize(ServerAction action)
         Physics.autoSimulation = action.autoSimulation;
         Physics.autoSyncTransforms = Physics.autoSimulation;
 
-        if (action.alwaysReturnVisibleRange)
-        {
+        if (action.alwaysReturnVisibleRange) {
             ((PhysicsRemoteFPSAgentController)primaryAgent).alwaysReturnVisibleRange =
                 action.alwaysReturnVisibleRange;
         }
@@ -395,19 +355,15 @@ public void Initialize(ServerAction action)
         //if multi agent requested, add duplicates of primary agent now
         addAgents(action);
         this.agents[0].m_Camera.depth = 9999;
-        if (action.startAgentsRotatedBy != 0f)
-        {
+        if (action.startAgentsRotatedBy != 0f) {
             RotateAgentsByRotatingUniverse(action.startAgentsRotatedBy);
-        }
-        else
-        {
+        } else {
             ResetSceneBounds();
         }
         this.agentManagerState = AgentState.ActionComplete;
     }
 
-    private void SetUpLocobotController(ServerAction action)
-    {
+    private void SetUpLocobotController(ServerAction action) {
         this.agents.Clear();
         // force snapToGrid to be false since we are stochastic
         action.snapToGrid = false;
@@ -415,8 +371,7 @@ private void SetUpLocobotController(ServerAction action)
         primaryAgent = createAgentType(typeof(LocobotFPSAgentController), baseAgentComponent);
     }
 
-    private void SetUpDroneController(ServerAction action)
-    {
+    private void SetUpDroneController(ServerAction action) {
         this.agents.Clear();
         // force snapToGrid to be false
         action.snapToGrid = false;
@@ -424,8 +379,7 @@ private void SetUpDroneController(ServerAction action)
         primaryAgent = createAgentType(typeof(DroneFPSAgentController), baseAgentComponent);
     }
 
-    private void SetUpStretchController(ServerAction action)
-    {
+    private void SetUpStretchController(ServerAction action) {
         this.agents.Clear();
         // force snapToGrid to be false
         action.snapToGrid = false;
@@ -434,8 +388,7 @@ private void SetUpStretchController(ServerAction action)
         baseAgentComponent.StretchBodyColliders.SetActive(true);
     }
 
-    private void SetUpStretchABController(ServerAction action)
-    {
+    private void SetUpStretchABController(ServerAction action) {
         this.agents.Clear();
         // force snapToGrid to be false
         action.snapToGrid = false;
@@ -445,15 +398,13 @@ private void SetUpStretchABController(ServerAction action)
 
     // note: this doesn't take a ServerAction because we don't have to force the snpToGrid bool
     // to be false like in other controller types.
-    public void SetUpPhysicsController()
-    {
+    public void SetUpPhysicsController() {
         this.agents.Clear();
         BaseAgentComponent baseAgentComponent = GameObject.FindObjectOfType<BaseAgentComponent>();
         primaryAgent = createAgentType(typeof(PhysicsRemoteFPSAgentController), baseAgentComponent);
     }
 
-    public void SetUpFpinController(ServerAction action)
-    {
+    public void SetUpFpinController(ServerAction action) {
         Debug.Log("inside SetUpFpinController");
         this.agents.Clear();
         BaseAgentComponent baseAgentComponent = GameObject.FindObjectOfType<BaseAgentComponent>();
@@ -463,8 +414,7 @@ public void SetUpFpinController(ServerAction action)
     private BaseFPSAgentController createAgentType(
         Type agentType,
         BaseAgentComponent agentComponent
-    )
-    {
+    ) {
         BaseFPSAgentController agent =
             Activator.CreateInstance(agentType, new object[] { agentComponent, this })
             as BaseFPSAgentController;
@@ -472,8 +422,7 @@ BaseAgentComponent agentComponent
         return agent;
     }
 
-    private void SetUpArmController(bool midLevelArm)
-    {
+    private void SetUpArmController(bool midLevelArm) {
         this.agents.Clear();
         BaseAgentComponent baseAgentComponent = GameObject.FindObjectOfType<BaseAgentComponent>();
         primaryAgent = createAgentType(typeof(KinovaArmAgentController), baseAgentComponent);
@@ -486,23 +435,19 @@ private void SetUpArmController(bool midLevelArm)
     // on initialization of agentMode = "arm" and agentControllerType = "mid-level"
     // if mass threshold should be used to prevent arm from knocking over objects that
     // are too big (table, sofa, shelf, etc) use this
-    private void SetUpMassThreshold(float massThreshold)
-    {
+    private void SetUpMassThreshold(float massThreshold) {
         CollisionListener.useMassThreshold = true;
         CollisionListener.massThreshold = massThreshold;
         primaryAgent.MakeObjectsStaticKinematicMassThreshold();
     }
 
     // return reference to primary agent in case we need a reference to the primary
-    public BaseFPSAgentController PrimaryAgent
-    {
+    public BaseFPSAgentController PrimaryAgent {
         get => this.primaryAgent;
     }
 
-    private void addAgents(ServerAction action)
-    {
-        if (action.agentCount > 1)
-        {
+    private void addAgents(ServerAction action) {
+        if (action.agentCount > 1) {
             // note: for procedural scenes, adding multiple agents in will need to be done differently as currently
             // initializing additional agents assumes the scene is already setup, and Houses initialize the
             // primary agent floating in space, then generates the house, then teleports the primary agent.
@@ -512,8 +457,7 @@ private void addAgents(ServerAction action)
                 UnityEngine
                     .SceneManagement.SceneManager.GetActiveScene()
                     .name.StartsWith("Procedural")
-            )
-            {
+            ) {
                 throw new NotImplementedException(
                     $"Procedural scenes only support a single agent currently."
                 );
@@ -526,46 +470,38 @@ private void addAgents(ServerAction action)
                 i < action.agentCount
                     && this.agents.Count < Math.Min(agentColors.Length, action.agentCount);
                 i++
-            )
-            {
+            ) {
                 action.x = reachablePositions[i + 4].x;
                 action.y = reachablePositions[i + 4].y;
                 action.z = reachablePositions[i + 4].z;
                 addAgent(action);
                 Physics.SyncTransforms(); // must do this so that when we CapsuleCast we see the most recently added agent
             }
-            for (int i = 1; i < this.agents.Count; i++)
-            {
+            for (int i = 1; i < this.agents.Count; i++) {
                 this.agents[i].m_Camera.depth = 1;
             }
         }
     }
 
-    public void ResetSceneBounds()
-    {
+    public void ResetSceneBounds() {
         // Recording initially disabled renderers and scene bounds
         sceneBounds = UtilityFunctions.CreateEmptyBounds();
-        foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>())
-        {
-            if (r.enabled)
-            {
+        foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>()) {
+            if (r.enabled) {
                 sceneBounds.Encapsulate(r.bounds);
             }
         }
     }
 
-    public void RotateAgentsByRotatingUniverse(float rotation)
-    {
+    public void RotateAgentsByRotatingUniverse(float rotation) {
         List<Quaternion> startAgentRots = new List<Quaternion>();
 
-        foreach (BaseFPSAgentController agent in this.agents)
-        {
+        foreach (BaseFPSAgentController agent in this.agents) {
             startAgentRots.Add(agent.transform.rotation);
         }
 
         GameObject superObject = GameObject.Find("SuperTopLevel");
-        if (superObject == null)
-        {
+        if (superObject == null) {
             superObject = new GameObject("SuperTopLevel");
         }
 
@@ -576,28 +512,24 @@ public void RotateAgentsByRotatingUniverse(float rotation)
             GameObject go in UnityEngine
                 .SceneManagement.SceneManager.GetActiveScene()
                 .GetRootGameObjects()
-        )
-        {
+        ) {
             topLevelObjects.Add(go);
             go.transform.SetParent(superObject.transform);
         }
 
         superObject.transform.rotation = Quaternion.Euler(0f, rotation, 0f);
-        foreach (GameObject go in topLevelObjects)
-        {
+        foreach (GameObject go in topLevelObjects) {
             go.transform.SetParent(null);
         }
 
-        for (int i = 0; i < this.agents.Count; i++)
-        {
+        for (int i = 0; i < this.agents.Count; i++) {
             agents[i].transform.rotation = startAgentRots[i];
         }
 
         ResetSceneBounds();
     }
 
-    public void registerAsThirdPartyCamera(Camera camera)
-    {
+    public void registerAsThirdPartyCamera(Camera camera) {
         this.thirdPartyCameras.Add(camera);
 #if PLATFORM_CLOUD_RENDERING
         camera.targetTexture = createRenderTexture(
@@ -613,30 +545,23 @@ private float ClampFieldOfView(
         float defaultVal = 90f,
         float min = 0f,
         float max = 180f
-    )
-    {
+    ) {
         return (fov <= min || fov > max) ? defaultVal : fov;
     }
 
-    public void updateImageSynthesis(bool status)
-    {
-        foreach (var agent in this.agents)
-        {
+    public void updateImageSynthesis(bool status) {
+        foreach (var agent in this.agents) {
             agent.updateImageSynthesis(status);
         }
     }
 
-    public void updateThirdPartyCameraImageSynthesis(bool status)
-    {
-        if (status)
-        {
-            foreach (var camera in this.thirdPartyCameras)
-            {
+    public void updateThirdPartyCameraImageSynthesis(bool status) {
+        if (status) {
+            foreach (var camera in this.thirdPartyCameras) {
                 GameObject gameObject = camera.gameObject;
                 var imageSynthesis =
                     gameObject.GetComponentInChildren<ImageSynthesis>() as ImageSynthesis;
-                if (imageSynthesis == null)
-                {
+                if (imageSynthesis == null) {
                     gameObject.AddComponent(typeof(ImageSynthesis));
                 }
                 imageSynthesis =
@@ -660,10 +585,8 @@ private void updateCameraProperties(
         bool agentPositionRelativeCoordinates = false,
         string parent = null,
         int agentId = 0
-    )
-    {
-        if (orthographic != true && orthographicSize != null)
-        {
+    ) {
+        if (orthographic != true && orthographicSize != null) {
             throw new InvalidOperationException(
                 $"orthographicSize(: {orthographicSize}) can only be set when orthographic=True.\n"
                     + "Otherwise, we use assume perspective camera setting."
@@ -671,8 +594,7 @@ private void updateCameraProperties(
             );
         }
 
-        if (parent != null && parent != "agent" && parent != "world")
-        {
+        if (parent != null && parent != "agent" && parent != "world") {
             throw new InvalidOperationException(
                 $"parent: {parent} must be one of: null, agent, or world."
             );
@@ -680,47 +602,35 @@ private void updateCameraProperties(
 
         var agent = this.agents[agentId];
 
-        if (agentPositionRelativeCoordinates)
-        {
+        if (agentPositionRelativeCoordinates) {
             Transform oldParent = camera.transform.parent;
             camera.transform.SetParent(agent.transform);
             camera.transform.localScale = Vector3.one; // Previous comment suggested that these local scale changes are necessary after reparenting
 
-            if (position.HasValue)
-            {
+            if (position.HasValue) {
                 camera.transform.localPosition = position.Value;
             }
-            if (rotation.HasValue)
-            {
+            if (rotation.HasValue) {
                 camera.transform.localEulerAngles = rotation.Value;
             }
             camera.transform.SetParent(oldParent);
             camera.transform.localScale = Vector3.one;
-        }
-        else
-        {
-            if (position.HasValue)
-            {
+        } else {
+            if (position.HasValue) {
                 camera.gameObject.transform.position = position.Value;
             }
-            if (rotation.HasValue)
-            {
+            if (rotation.HasValue) {
                 camera.gameObject.transform.eulerAngles = rotation.Value;
             }
         }
 
-        if (parent == "agent")
-        {
+        if (parent == "agent") {
             camera.transform.SetParent(agent.transform);
             camera.transform.localScale = Vector3.one;
-        }
-        else if (parent == "world")
-        {
+        } else if (parent == "world") {
             camera.transform.SetParent(null);
             camera.transform.localScale = Vector3.one;
-        }
-        else if (parent != null)
-        {
+        } else if (parent != null) {
             throw new InvalidOperationException(
                 $"parent: {parent} must be one of: null, agent, or world."
             );
@@ -728,11 +638,9 @@ private void updateCameraProperties(
 
         // updates the camera's perspective
         camera.fieldOfView = fieldOfView;
-        if (orthographic != null)
-        {
+        if (orthographic != null) {
             camera.orthographic = (bool)orthographic;
-            if (orthographic == true && orthographicSize != null)
-            {
+            if (orthographic == true && orthographicSize != null) {
                 camera.orthographicSize = (float)orthographicSize;
             }
         }
@@ -740,42 +648,32 @@ private void updateCameraProperties(
         //updates camera near and far clipping planes
         //default to near and far clipping planes of agent camera, which are currently
         //static values and are not exposed in anything like Initialize
-        if (nearClippingPlane != null)
-        {
+        if (nearClippingPlane != null) {
             camera.nearClipPlane = (float)nearClippingPlane;
         }
         //default to primary agent's near clip plane value
-        else
-        {
+        else {
             camera.nearClipPlane = this.primaryAgent.m_Camera.nearClipPlane;
         }
 
-        if (farClippingPlane != null)
-        {
+        if (farClippingPlane != null) {
             camera.farClipPlane = (float)farClippingPlane;
         }
         //default to primary agent's far clip plane value
-        else
-        {
+        else {
             camera.farClipPlane = this.primaryAgent.m_Camera.farClipPlane;
         }
 
         // supports a solid color skybox, which work well with videos and images (i.e., white/black/orange/blue backgrounds)
-        if (skyboxColor == "default")
-        {
+        if (skyboxColor == "default") {
             camera.clearFlags = CameraClearFlags.Skybox;
-        }
-        else if (skyboxColor != null)
-        {
+        } else if (skyboxColor != null) {
             Color color;
             bool successfullyParsed = ColorUtility.TryParseHtmlString(skyboxColor, out color);
-            if (successfullyParsed)
-            {
+            if (successfullyParsed) {
                 camera.clearFlags = CameraClearFlags.SolidColor;
                 camera.backgroundColor = color;
-            }
-            else
-            {
+            } else {
                 throw new ArgumentException(
                     $"Invalid skyboxColor: {skyboxColor}! Cannot be parsed as an HTML color."
                 );
@@ -783,8 +681,7 @@ private void updateCameraProperties(
         }
 
         // Anti-aliasing
-        if (antiAliasing != null)
-        {
+        if (antiAliasing != null) {
             updateAntiAliasing(
                 postProcessLayer: camera.gameObject.GetComponentInChildren<PostProcessLayer>(),
                 antiAliasing: antiAliasing
@@ -792,36 +689,28 @@ private void updateCameraProperties(
         }
 
         ImageSynthesis imageSynthesis = camera.gameObject.GetComponentInChildren<ImageSynthesis>();
-        if (imageSynthesis != null && imageSynthesis.enabled)
-        {
+        if (imageSynthesis != null && imageSynthesis.enabled) {
             imageSynthesis.OnCameraChange();
         }
 
         this.activeAgent().actionFinished(success: true);
     }
 
-    private void assertFovInBounds(float fov)
-    {
-        if (fov <= MIN_FOV || fov >= MAX_FOV)
-        {
+    private void assertFovInBounds(float fov) {
+        if (fov <= MIN_FOV || fov >= MAX_FOV) {
             throw new ArgumentOutOfRangeException(
                 $"fieldOfView: {fov} must be in {MIN_FOV} < fieldOfView > {MIN_FOV}."
             );
         }
     }
 
-    public void updateAntiAliasing(PostProcessLayer postProcessLayer, string antiAliasing)
-    {
+    public void updateAntiAliasing(PostProcessLayer postProcessLayer, string antiAliasing) {
         antiAliasing = antiAliasing.ToLower();
-        if (antiAliasing == "none")
-        {
+        if (antiAliasing == "none") {
             postProcessLayer.enabled = false;
-        }
-        else
-        {
+        } else {
             postProcessLayer.enabled = true;
-            switch (antiAliasing)
-            {
+            switch (antiAliasing) {
                 case "fxaa":
                     postProcessLayer.antialiasingMode = PostProcessLayer
                         .Antialiasing
@@ -859,8 +748,7 @@ public void AddThirdPartyCamera(
         bool agentPositionRelativeCoordinates = false,
         string parent = "world",
         int agentId = 0
-    )
-    {
+    ) {
         // adds error if fieldOfView is out of bounds
         assertFovInBounds(fov: fieldOfView);
 
@@ -877,8 +765,7 @@ public void AddThirdPartyCamera(
             || renderInstanceSegmentation
             || renderNormalsImage
             || renderFlowImage
-        )
-        {
+        ) {
             gameObject.AddComponent(typeof(ImageSynthesis));
         }
 
@@ -908,10 +795,8 @@ public void AddThirdPartyCamera(
     }
 
     // helper that can be used when converting Dictionary<string, float> to a Vector3.
-    private Vector3 parseOptionalVector3(OptionalVector3 optionalVector3, Vector3 defaultsOnNull)
-    {
-        if (optionalVector3 == null)
-        {
+    private Vector3 parseOptionalVector3(OptionalVector3 optionalVector3, Vector3 defaultsOnNull) {
+        if (optionalVector3 == null) {
             return defaultsOnNull;
         }
         return new Vector3(
@@ -922,14 +807,12 @@ private Vector3 parseOptionalVector3(OptionalVector3 optionalVector3, Vector3 de
     }
 
     // Here, we don't want some dimensions set. For instance, set x, but not y.
-    public class OptionalVector3
-    {
+    public class OptionalVector3 {
         public float? x = null;
         public float? y = null;
         public float? z = null;
 
-        public OptionalVector3(float? x = null, float? y = null, float? z = null)
-        {
+        public OptionalVector3(float? x = null, float? y = null, float? z = null) {
             this.x = x;
             this.y = y;
             this.z = z;
@@ -949,11 +832,9 @@ public void UpdateMainCamera(
         float? farClippingPlane = null,
         string antiAliasing = null,
         int agentId = 0
-    )
-    {
+    ) {
         // adds error if fieldOfView is out of bounds
-        if (fieldOfView != null)
-        {
+        if (fieldOfView != null) {
             assertFovInBounds(fov: (float)fieldOfView);
         }
 
@@ -1006,17 +887,14 @@ public void UpdateThirdPartyCamera(
         bool agentPositionRelativeCoordinates = false,
         string parent = null,
         int agentId = 0
-    )
-    {
+    ) {
         // adds error if fieldOfView is out of bounds
-        if (fieldOfView != null)
-        {
+        if (fieldOfView != null) {
             assertFovInBounds(fov: (float)fieldOfView);
         }
 
         // count is out of bounds
-        if (thirdPartyCameraId >= thirdPartyCameras.Count || thirdPartyCameraId < 0)
-        {
+        if (thirdPartyCameraId >= thirdPartyCameras.Count || thirdPartyCameraId < 0) {
             throw new ArgumentOutOfRangeException(
                 $"thirdPartyCameraId: {thirdPartyCameraId} (int: default=0) must in 0 <= thirdPartyCameraId < len(thirdPartyCameras)={thirdPartyCameras.Count}."
             );
@@ -1026,14 +904,11 @@ public void UpdateThirdPartyCamera(
 
         Vector3 oldPosition;
         Vector3 oldRotation;
-        if (agentPositionRelativeCoordinates)
-        {
+        if (agentPositionRelativeCoordinates) {
             // keeps positions/rotations at default values, if unspecified.
             oldPosition = thirdPartyCamera.transform.localPosition;
             oldRotation = thirdPartyCamera.transform.localEulerAngles;
-        }
-        else
-        {
+        } else {
             // keeps positions/rotations at default values, if unspecified.
             oldPosition = thirdPartyCamera.transform.position;
             oldRotation = thirdPartyCamera.transform.eulerAngles;
@@ -1064,8 +939,7 @@ public void UpdateThirdPartyCamera(
         );
     }
 
-    private void addAgent(ServerAction action)
-    {
+    private void addAgent(ServerAction action) {
         Vector3 clonePosition = new Vector3(action.x, action.y, action.z);
         BaseAgentComponent componentClone = UnityEngine.Object.Instantiate(
             primaryAgent.baseAgentComponent
@@ -1086,8 +960,7 @@ private void addAgent(ServerAction action)
         agent.ProcessControlCommand(action.dynamicServerAction);
     }
 
-    private Vector3 agentStartPosition(BaseFPSAgentController agent)
-    {
+    private Vector3 agentStartPosition(BaseFPSAgentController agent) {
         Transform t = agent.transform;
         Vector3[] castDirections = new Vector3[]
         {
@@ -1104,99 +977,78 @@ private Vector3 agentStartPosition(BaseFPSAgentController agent)
         CharacterController charContr = agent.m_CharacterController;
         Vector3 p1 = t.position + charContr.center + Vector3.up * -charContr.height * 0.5f;
         Vector3 p2 = p1 + Vector3.up * charContr.height;
-        foreach (Vector3 d in castDirections)
-        {
-            if (Physics.CapsuleCast(p1, p2, charContr.radius, d, out hit))
-            {
-                if (hit.distance > maxHit.distance)
-                {
+        foreach (Vector3 d in castDirections) {
+            if (Physics.CapsuleCast(p1, p2, charContr.radius, d, out hit)) {
+                if (hit.distance > maxHit.distance) {
                     maxHit = hit;
                     maxDirection = d;
                 }
             }
         }
 
-        if (maxHit.distance > (charContr.radius * 5))
-        {
+        if (maxHit.distance > (charContr.radius * 5)) {
             return t.position + (maxDirection * (charContr.radius * 4));
         }
 
         return Vector3.zero;
     }
 
-    public void UpdateAgentColor(BaseFPSAgentController agent, Color color)
-    {
+    public void UpdateAgentColor(BaseFPSAgentController agent, Color color) {
         foreach (
             MeshRenderer r in agent.gameObject.GetComponentsInChildren<MeshRenderer>()
                 as MeshRenderer[]
-        )
-        {
-            foreach (Material m in r.materials)
-            {
-                if (m.name.Contains("Agent_Color_Mat"))
-                {
+        ) {
+            foreach (Material m in r.materials) {
+                if (m.name.Contains("Agent_Color_Mat")) {
                     m.color = color;
                 }
             }
         }
     }
 
-    public IEnumerator ResetCoroutine(ServerAction response)
-    {
+    public IEnumerator ResetCoroutine(ServerAction response) {
         // Setting all the agents invisible here is silly but necessary
         // as otherwise the FirstPersonCharacterCull.cs script will
         // try to disable renderers that are invalid (but not null)
         // as the scene they existed in has changed.
-        for (int i = 0; i < agents.Count; i++)
-        {
+        for (int i = 0; i < agents.Count; i++) {
             Destroy(agents[i].baseAgentComponent);
         }
         yield return null;
 
-        if (string.IsNullOrEmpty(response.sceneName))
-        {
+        if (string.IsNullOrEmpty(response.sceneName)) {
             UnityEngine.SceneManagement.SceneManager.LoadScene(
                 UnityEngine.SceneManagement.SceneManager.GetActiveScene().name
             );
-        }
-        else
-        {
+        } else {
             UnityEngine.SceneManagement.SceneManager.LoadScene(response.sceneName);
         }
     }
 
-    public void resetMaterials()
-    {
+    public void resetMaterials() {
         ColorChanger colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
         colorChangeComponent.ResetMaterials();
         doResetMaterials = false;
         doResetColors = false;
     }
 
-    public void resetColors()
-    {
+    public void resetColors() {
         ColorChanger colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
         colorChangeComponent.ResetColors();
         doResetColors = false;
     }
 
-    public void Reset(ServerAction response)
-    {
-        if (doResetMaterials)
-        {
+    public void Reset(ServerAction response) {
+        if (doResetMaterials) {
             resetMaterials();
-        }
-        else if (doResetColors)
-        {
+        } else if (doResetColors) {
             resetColors();
         }
         StartCoroutine(ResetCoroutine(response));
     }
 
-    public bool SwitchScene(string sceneName)
-    {
-        if (!string.IsNullOrEmpty(sceneName))
-        {
+    public bool SwitchScene(string sceneName) {
+        if (!string.IsNullOrEmpty(sceneName)) {
             UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName);
             return true;
         }
@@ -1206,8 +1058,7 @@ public bool SwitchScene(string sceneName)
     // Decide whether agent has stopped actions
     // And if we need to capture a new frame
 
-    private void Update()
-    {
+    private void Update() {
         physicsSceneManager.isSceneAtRest = true; // assume the scene is at rest by default
     }
 
@@ -1215,33 +1066,26 @@ private void captureScreenAsync(
         List<KeyValuePair<string, byte[]>> payload,
         string key,
         Camera camera
-    )
-    {
+    ) {
         RenderTexture tt = camera.targetTexture;
         RenderTexture.active = tt;
         camera.Render();
         AsyncGPUReadback.Request(
             tt,
             0,
-            (request) =>
-            {
-                if (!request.hasError)
-                {
+            (request) => {
+                if (!request.hasError) {
                     var data = request.GetData<byte>().ToArray();
                     payload.Add(new KeyValuePair<string, byte[]>(key, data));
-                }
-                else
-                {
+                } else {
                     Debug.Log("Request error: " + request.hasError);
                 }
             }
         );
     }
 
-    private byte[] captureScreen()
-    {
-        if (tex.height != UnityEngine.Screen.height || tex.width != UnityEngine.Screen.width)
-        {
+    private byte[] captureScreen() {
+        if (tex.height != UnityEngine.Screen.height || tex.width != UnityEngine.Screen.width) {
             tex = new Texture2D(
                 UnityEngine.Screen.width,
                 UnityEngine.Screen.height,
@@ -1255,8 +1099,7 @@ private byte[] captureScreen()
         return tex.GetRawTextureData();
     }
 
-    private void addThirdPartyCameraImage(List<KeyValuePair<string, byte[]>> payload, Camera camera)
-    {
+    private void addThirdPartyCameraImage(List<KeyValuePair<string, byte[]>> payload, Camera camera) {
 #if PLATFORM_CLOUD_RENDERING
         captureScreenAsync(payload, "image-thirdParty-camera", camera);
 #else
@@ -1266,16 +1109,13 @@ private void addThirdPartyCameraImage(List<KeyValuePair<string, byte[]>> payload
 #endif
     }
 
-    private void addImage(List<KeyValuePair<string, byte[]>> payload, BaseFPSAgentController agent)
-    {
-        if (this.renderImage)
-        {
+    private void addImage(List<KeyValuePair<string, byte[]>> payload, BaseFPSAgentController agent) {
+        if (this.renderImage) {
 #if PLATFORM_CLOUD_RENDERING
             captureScreenAsync(payload, "image", agent.m_Camera);
 #else
             // XXX may not need this since we call render in captureScreenAsync
-            if (this.agents.Count > 1 || this.thirdPartyCameras.Count > 0)
-            {
+            if (this.agents.Count > 1 || this.thirdPartyCameras.Count > 0) {
                 RenderTexture.active = agent.m_Camera.activeTexture;
                 agent.m_Camera.Render();
             }
@@ -1284,35 +1124,27 @@ private void addImage(List<KeyValuePair<string, byte[]>> payload, BaseFPSAgentCo
         }
     }
 
-    private void resetImageSynthesis(Camera camera)
-    {
+    private void resetImageSynthesis(Camera camera) {
         ImageSynthesis imageSynthesis = camera.gameObject.GetComponentInChildren<ImageSynthesis>();
-        if (imageSynthesis != null && imageSynthesis.enabled)
-        {
+        if (imageSynthesis != null && imageSynthesis.enabled) {
             imageSynthesis.OnCameraChange();
             imageSynthesis.OnSceneChange();
         }
     }
 
-    private void resetAllImageSynthesis()
-    {
-        foreach (var agent in this.agents)
-        {
+    private void resetAllImageSynthesis() {
+        foreach (var agent in this.agents) {
             resetImageSynthesis(agent.m_Camera);
         }
 
-        foreach (var camera in this.thirdPartyCameras)
-        {
+        foreach (var camera in this.thirdPartyCameras) {
             resetImageSynthesis(camera);
         }
     }
 
-    public IEnumerator WaitOnResolutionChange(int width, int height)
-    {
-        for (int i = 0; i < 30; i++)
-        {
-            if (UnityEngine.Screen.width == width && UnityEngine.Screen.height == height)
-            {
+    public IEnumerator WaitOnResolutionChange(int width, int height) {
+        for (int i = 0; i < 30; i++) {
+            if (UnityEngine.Screen.width == width && UnityEngine.Screen.height == height) {
                 break;
             }
             yield return null;
@@ -1320,8 +1152,7 @@ public IEnumerator WaitOnResolutionChange(int width, int height)
         }
 
         bool success = true;
-        if (Screen.width != width || Screen.height != height)
-        {
+        if (Screen.width != width || Screen.height != height) {
             success = false;
             this.primaryAgent.errorMessage = (
                 $"Screen resolution change failed, requested ({width}, {height}), actual ({Screen.width}, {Screen.height})."
@@ -1333,13 +1164,10 @@ public IEnumerator WaitOnResolutionChange(int width, int height)
         this.primaryAgent.actionFinished(success);
     }
 
-    public void ChangeQuality(string quality)
-    {
+    public void ChangeQuality(string quality) {
         string[] names = QualitySettings.names;
-        for (int i = 0; i < names.Length; i++)
-        {
-            if (names[i] == quality)
-            {
+        for (int i = 0; i < names.Length; i++) {
+            if (names[i] == quality) {
                 QualitySettings.SetQualityLevel(i, true);
                 break;
             }
@@ -1348,8 +1176,7 @@ public void ChangeQuality(string quality)
         this.primaryAgent.actionFinished(true);
     }
 
-    public void ChangeResolution(int x, int y)
-    {
+    public void ChangeResolution(int x, int y) {
         Screen.SetResolution(width: x, height: y, false);
         Debug.Log(
             "current screen resolution pre change: " + Screen.width + " height" + Screen.height
@@ -1378,13 +1205,10 @@ private void addObjectImage(
         List<KeyValuePair<string, byte[]>> payload,
         BaseFPSAgentController agent,
         ref MetadataWrapper metadata
-    )
-    {
-        if (this.renderInstanceSegmentation || this.renderSemanticSegmentation)
-        {
+    ) {
+        if (this.renderInstanceSegmentation || this.renderSemanticSegmentation) {
             Debug.Log($"imageSynthesis null {agent.ImageSynthesis == null}");
-            if (!agent.ImageSynthesis.hasCapturePass("_id"))
-            {
+            if (!agent.ImageSynthesis.hasCapturePass("_id")) {
                 Debug.LogError(
                     "Object Image not available in imagesynthesis - returning empty image"
                 );
@@ -1393,8 +1217,7 @@ ref MetadataWrapper metadata
             payload.Add(new KeyValuePair<string, byte[]>("image_ids", bytes));
 
             List<ColorId> colors = new List<ColorId>();
-            foreach (Color key in agent.ImageSynthesis.colorIds.Keys)
-            {
+            foreach (Color key in agent.ImageSynthesis.colorIds.Keys) {
                 ColorId cid = new ColorId();
                 cid.color = new ushort[]
                 {
@@ -1416,12 +1239,9 @@ private void addImageSynthesisImage(
         bool flag,
         string captureName,
         string fieldName
-    )
-    {
-        if (flag)
-        {
-            if (!synth.hasCapturePass(captureName))
-            {
+    ) {
+        if (flag) {
+            if (!synth.hasCapturePass(captureName)) {
                 Debug.LogError(captureName + " not available - sending empty image");
             }
             byte[] bytes = synth.Encode(captureName);
@@ -1431,14 +1251,12 @@ string fieldName
 
     // Used for benchmarking only the server-side
     // no call is made to the Python side
-    private IEnumerator EmitFrameNoClient()
-    {
+    private IEnumerator EmitFrameNoClient() {
         frameCounter += 1;
 
         bool shouldRender = this.renderImage;
 
-        if (shouldRender)
-        {
+        if (shouldRender) {
             // we should only read the screen buffer after rendering is complete
             yield return new WaitForEndOfFrame();
             // must wait an additional frame when in synchronous mode otherwise the frame lags
@@ -1456,19 +1274,16 @@ public void createPayload(
         List<KeyValuePair<string, byte[]>> renderPayload,
         bool shouldRender,
         bool shouldRenderImageSynthesis
-    )
-    {
+    ) {
         multiMeta.agents = new MetadataWrapper[this.agents.Count];
         multiMeta.activeAgentId = this.activeAgentId;
         multiMeta.sequenceId = this.currentSequenceId;
 
         RenderTexture currentTexture = null;
 
-        if (shouldRender)
-        {
+        if (shouldRender) {
             currentTexture = RenderTexture.active;
-            for (int i = 0; i < this.thirdPartyCameras.Count; i++)
-            {
+            for (int i = 0; i < this.thirdPartyCameras.Count; i++) {
                 ThirdPartyCameraMetadata cMetadata = new ThirdPartyCameraMetadata();
                 Camera camera = thirdPartyCameras.ToArray()[i];
                 cMetadata.thirdPartyCameraId = i;
@@ -1478,8 +1293,7 @@ bool shouldRenderImageSynthesis
 
                 //agent relative third party camera metadata here
                 //if the camera is a child of the base agent, then return local space values
-                if (camera.GetComponentInParent<BaseAgentComponent>())
-                {
+                if (camera.GetComponentInParent<BaseAgentComponent>()) {
                     cMetadata.agentPositionRelativeThirdPartyCameraPosition = camera
                         .gameObject
                         .transform
@@ -1488,9 +1302,7 @@ bool shouldRenderImageSynthesis
                         .gameObject
                         .transform
                         .localEulerAngles;
-                }
-                else
-                {
+                } else {
                     //if this third party camera is not a child of the agent, then the agent relative coordinates
                     //are the same as the world coordinates so
                     cMetadata.agentPositionRelativeThirdPartyCameraPosition = camera
@@ -1507,8 +1319,7 @@ bool shouldRenderImageSynthesis
 
                 cameraMetadata[i] = cMetadata;
                 addThirdPartyCameraImage(renderPayload, camera);
-                if (shouldRenderImageSynthesis)
-                {
+                if (shouldRenderImageSynthesis) {
                     ImageSynthesis imageSynthesis =
                         camera.gameObject.GetComponentInChildren<ImageSynthesis>()
                         as ImageSynthesis;
@@ -1550,8 +1361,7 @@ bool shouldRenderImageSynthesis
                 }
             }
         }
-        for (int i = 0; i < this.agents.Count; i++)
-        {
+        for (int i = 0; i < this.agents.Count; i++) {
             BaseFPSAgentController agent = this.agents[i];
             MetadataWrapper metadata = agent.generateMetadataWrapper();
             // This value may never change, but the purpose is to provide a way
@@ -1562,11 +1372,9 @@ bool shouldRenderImageSynthesis
 
             // we don't need to render the agent's camera for the first agent
 
-            if (shouldRender)
-            {
+            if (shouldRender) {
                 addImage(renderPayload, agent);
-                if (shouldRenderImageSynthesis)
-                {
+                if (shouldRenderImageSynthesis) {
                     addImageSynthesisImage(
                         renderPayload,
                         agent.imageSynthesis,
@@ -1603,33 +1411,27 @@ bool shouldRenderImageSynthesis
             multiMeta.agents[i] = metadata;
         }
 
-        if (shouldRender)
-        {
+        if (shouldRender) {
             RenderTexture.active = currentTexture;
         }
     }
 
-    private string serializeMetadataJson(MultiAgentMetadata multiMeta)
-    {
+    private string serializeMetadataJson(MultiAgentMetadata multiMeta) {
         var jsonResolver = new ShouldSerializeContractResolver();
         return Newtonsoft.Json.JsonConvert.SerializeObject(
             multiMeta,
             Newtonsoft.Json.Formatting.None,
-            new Newtonsoft.Json.JsonSerializerSettings()
-            {
+            new Newtonsoft.Json.JsonSerializerSettings() {
                 ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                 ContractResolver = jsonResolver
             }
         );
     }
 
-    private bool canEmit()
-    {
+    private bool canEmit() {
         bool emit = true;
-        foreach (BaseFPSAgentController agent in this.agents)
-        {
-            if (agent.agentState != AgentState.Emit)
-            {
+        foreach (BaseFPSAgentController agent in this.agents) {
+            if (agent.agentState != AgentState.Emit) {
                 emit = false;
                 break;
             }
@@ -1639,8 +1441,7 @@ private bool canEmit()
             || this.agentManagerState == AgentState.Error;
     }
 
-    private RenderTexture createRenderTexture(int width, int height)
-    {
+    private RenderTexture createRenderTexture(int width, int height) {
         RenderTexture rt = new RenderTexture(
             width: width,
             height: height,
@@ -1648,36 +1449,27 @@ private RenderTexture createRenderTexture(int width, int height)
             GraphicsFormat.R8G8B8A8_UNorm
         );
         rt.antiAliasing = 4;
-        if (rt.Create())
-        {
+        if (rt.Create()) {
             Debug.Log(" created render texture with width= " + width + " height=" + height);
             return rt;
-        }
-        else
-        {
+        } else {
             // throw exception ?
             Debug.LogError("Could not create a renderTexture");
             return null;
         }
     }
 
-    public IEnumerator EmitFrame()
-    {
-        while (true)
-        {
+    public IEnumerator EmitFrame() {
+        while (true) {
             bool shouldRender = this.renderImage && serverSideScreenshot;
 
             bool shouldRenderImageSynthesis = shouldRender && this.renderImageSynthesis;
-            if (renderImageSynthesisChanged)
-            {
-                foreach (BaseFPSAgentController agent in this.agents)
-                {
+            if (renderImageSynthesisChanged) {
+                foreach (BaseFPSAgentController agent in this.agents) {
                     foreach (
                         ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
-                    )
-                    {
-                        if (ims.enabled)
-                        {
+                    ) {
+                        if (ims.enabled) {
                             ims.updateCameraStatuses(this.renderImageSynthesis);
                         }
                     }
@@ -1688,21 +1480,17 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
 
             frameCounter += 1;
 
-            if (this.agentManagerState == AgentState.ActionComplete)
-            {
+            if (this.agentManagerState == AgentState.ActionComplete) {
                 this.agentManagerState = AgentState.Emit;
             }
 
-            foreach (BaseFPSAgentController agent in this.agents)
-            {
-                if (agent.agentState == AgentState.ActionComplete)
-                {
+            foreach (BaseFPSAgentController agent in this.agents) {
+                if (agent.agentState == AgentState.ActionComplete) {
                     agent.agentState = AgentState.Emit;
                 }
             }
 
-            if (!this.canEmit())
-            {
+            if (!this.canEmit()) {
                 continue;
             }
             MultiAgentMetadata multiMeta = new MultiAgentMetadata();
@@ -1732,19 +1520,16 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
             // creation failure
             // Not running code below loses compatibility with python controlled editor
 #if !UNITY_WEBGL
-            if (serverType == serverTypes.WSGI)
-            {
+            if (serverType == serverTypes.WSGI) {
                 WWWForm form = new WWWForm();
                 form.AddField("metadata", serializeMetadataJson(multiMeta));
                 AsyncGPUReadback.WaitAllRequests();
-                foreach (var item in renderPayload)
-                {
+                foreach (var item in renderPayload) {
                     form.AddBinaryData(item.Key, item.Value);
                 }
                 form.AddField("token", robosimsClientToken);
 
-                if (this.sock == null)
-                {
+                if (this.sock == null) {
                     // Debug.Log("connecting to host: " + robosimsHost);
                     IPAddress host = IPAddress.Parse(robosimsHost);
                     IPEndPoint hostep = new IPEndPoint(host, robosimsPort);
@@ -1753,12 +1538,9 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                         SocketType.Stream,
                         ProtocolType.Tcp
                     );
-                    try
-                    {
+                    try {
                         this.sock.Connect(hostep);
-                    }
-                    catch (SocketException e)
-                    {
+                    } catch (SocketException e) {
                         var msg = e.ToString();
                         Debug.Log("Socket exception: " + msg);
                         // TODO: change how payload creation is run in editor, it keeps creating the payload every
@@ -1773,8 +1555,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                     }
                 }
 
-                if (this.sock != null && this.sock.Connected)
-                {
+                if (this.sock != null && this.sock.Connected) {
                     byte[] rawData = form.data;
 
                     string request =
@@ -1783,8 +1564,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                         + rawData.Length.ToString()
                         + "\r\n";
 
-                    foreach (KeyValuePair<string, string> entry in form.headers)
-                    {
+                    foreach (KeyValuePair<string, string> entry in form.headers) {
                         request += entry.Key + ": " + entry.Value + "\r\n";
                     }
                     request += "\r\n";
@@ -1804,16 +1584,14 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                     int contentLength = 0;
 
                     // read header
-                    while (true)
-                    {
+                    while (true) {
                         int received = this.sock.Receive(
                             headerBuffer,
                             bytesReceived,
                             headerBuffer.Length - bytesReceived,
                             SocketFlags.None
                         );
-                        if (received == 0)
-                        {
+                        if (received == 0) {
                             Debug.LogError(
                                 "0 bytes received attempting to read header - connection closed"
                             );
@@ -1824,8 +1602,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                         ;
                         string headerMsg = Encoding.ASCII.GetString(headerBuffer, 0, bytesReceived);
                         int offset = headerMsg.IndexOf("\r\n\r\n");
-                        if (offset > 0)
-                        {
+                        if (offset > 0) {
                             contentLength = parseContentLength(headerMsg.Substring(0, offset));
                             bodyBuffer = new byte[contentLength];
                             bodyBytesReceived = bytesReceived - (offset + 4);
@@ -1835,8 +1612,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                     }
 
                     // read body
-                    while (bodyBytesReceived < contentLength)
-                    {
+                    while (bodyBytesReceived < contentLength) {
                         // check for 0 bytes received
                         int received = this.sock.Receive(
                             bodyBuffer,
@@ -1844,8 +1620,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                             bodyBuffer.Length - bodyBytesReceived,
                             SocketFlags.None
                         );
-                        if (received == 0)
-                        {
+                        if (received == 0) {
                             Debug.LogError(
                                 "0 bytes received attempting to read body - connection closed"
                             );
@@ -1859,9 +1634,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                     string msg = Encoding.ASCII.GetString(bodyBuffer, 0, bodyBytesReceived);
                     ProcessControlCommand(msg);
                 }
-            }
-            else if (serverType == serverTypes.FIFO)
-            {
+            } else if (serverType == serverTypes.FIFO) {
                 byte[] msgPackMetadata =
                     MessagePack.MessagePackSerializer.Serialize<MultiAgentMetadata>(
                         multiMeta,
@@ -1880,8 +1653,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
                     )
                     .Wait(2000);
                 Debug.Log("ReachedTimeout " + !completed);
-                if (!completed)
-                {
+                if (!completed) {
                     Debug.Log(
                         "FIFO Timeout Reached. Start FIFO server first if remote control is needed."
                     );
@@ -1895,16 +1667,14 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
 #endif
 
                 AsyncGPUReadback.WaitAllRequests();
-                foreach (var item in renderPayload)
-                {
+                foreach (var item in renderPayload) {
                     this.fifoClient.SendMessage(FifoServer.Client.FormMap[item.Key], item.Value);
                 }
                 this.fifoClient.SendEOM();
                 string msg = this.fifoClient.ReceiveMessage();
                 ProcessControlCommand(msg);
 
-                while (canEmit() && this.fastActionEmit)
-                {
+                while (canEmit() && this.fastActionEmit) {
                     MetadataPatch patch = this.activeAgent().generateMetadataPatch();
                     patch.agentId = this.activeAgentId;
                     msgPackMetadata = MessagePack.MessagePackSerializer.Serialize(
@@ -1938,8 +1708,7 @@ ImageSynthesis ims in agent.gameObject.GetComponentsInChildren<ImageSynthesis>()
     }
 
     // Uniform entry point for both the test runner and the python server for step dispatch calls
-    public void ProcessControlCommand(DynamicServerAction controlCommand)
-    {
+    public void ProcessControlCommand(DynamicServerAction controlCommand) {
         this.renderInstanceSegmentation = this.initializedInstanceSeg;
 
         this.currentSequenceId = controlCommand.sequenceId;
@@ -1955,21 +1724,17 @@ public void ProcessControlCommand(DynamicServerAction controlCommand)
         if (
             agentManagerState == AgentState.Error
             && !errorAllowedActions.Contains(controlCommand.action)
-        )
-        {
+        ) {
             var activeAgent = this.activeAgent();
             activeAgent.errorMessage =
                 $"Critical Error. No more actions can be run before calling 'reset'. Action that caused error: '{activeAgent.lastAction}'";
             return;
         }
 
-        if (agentManagerActions.Contains(controlCommand.action))
-        {
+        if (agentManagerActions.Contains(controlCommand.action)) {
             // let's look in this class for the action
             this.activeAgent().ProcessControlCommand(controlCommand: controlCommand, target: this);
-        }
-        else
-        {
+        } else {
             // we only allow renderInstanceSegmentation to be flipped on
             // on a per step() basis, since by default the param is null
             // so we don't know if a request is meant to turn the param off
@@ -1978,8 +1743,7 @@ public void ProcessControlCommand(DynamicServerAction controlCommand)
             // was initialized to be true, but any particular step() may not set it
             // so we don't want to disable it inadvertently
 
-            if (controlCommand.renderInstanceSegmentation)
-            {
+            if (controlCommand.renderInstanceSegmentation) {
                 this.renderInstanceSegmentation = true;
             }
 
@@ -1988,8 +1752,7 @@ public void ProcessControlCommand(DynamicServerAction controlCommand)
                 || this.renderSemanticSegmentation
                 || this.renderInstanceSegmentation
                 || this.renderNormalsImage
-            )
-            {
+            ) {
                 updateImageSynthesis(true);
                 updateThirdPartyCameraImageSynthesis(true);
             }
@@ -1999,30 +1762,24 @@ public void ProcessControlCommand(DynamicServerAction controlCommand)
         }
     }
 
-    public BaseFPSAgentController GetActiveAgent()
-    {
+    public BaseFPSAgentController GetActiveAgent() {
         return this.agents[activeAgentId];
     }
 
-    public int GetActiveAgentId()
-    {
+    public int GetActiveAgentId() {
         return this.activeAgentId;
     }
 
-    public int GetThirdPartyCameraCount()
-    {
+    public int GetThirdPartyCameraCount() {
         return this.thirdPartyCameras.Count;
     }
 
-    private int parseContentLength(string header)
-    {
+    private int parseContentLength(string header) {
         // Debug.Log("got header: " + header);
         string[] fields = header.Split(new char[] { '\r', '\n' });
-        foreach (string field in fields)
-        {
+        foreach (string field in fields) {
             string[] elements = field.Split(new char[] { ':' });
-            if (elements[0].ToLower() == "content-length")
-            {
+            if (elements[0].ToLower() == "content-length") {
                 return Int32.Parse(elements[1].Trim());
             }
         }
@@ -2030,56 +1787,48 @@ private int parseContentLength(string header)
         return 0;
     }
 
-    private BaseFPSAgentController activeAgent()
-    {
+    private BaseFPSAgentController activeAgent() {
         return this.agents[activeAgentId];
     }
 
-    private void ProcessControlCommand(string msg)
-    {
+    private void ProcessControlCommand(string msg) {
         DynamicServerAction controlCommand = new DynamicServerAction(jsonMessage: msg);
         this.ProcessControlCommand(controlCommand);
     }
 
     // Extra helper functions
-    protected string LoadStringVariable(string variable, string name)
-    {
+    protected string LoadStringVariable(string variable, string name) {
         string envVarName = ENVIRONMENT_PREFIX + name.ToUpper();
         string envVarValue = Environment.GetEnvironmentVariable(envVarName);
         return envVarValue == null ? variable : envVarValue;
     }
 
-    protected int LoadIntVariable(int variable, string name)
-    {
+    protected int LoadIntVariable(int variable, string name) {
         string envVarName = ENVIRONMENT_PREFIX + name.ToUpper();
         string envVarValue = Environment.GetEnvironmentVariable(envVarName);
         return envVarValue == null ? variable : int.Parse(envVarValue);
     }
 
-    protected float LoadFloatVariable(float variable, string name)
-    {
+    protected float LoadFloatVariable(float variable, string name) {
         string envVarName = ENVIRONMENT_PREFIX + name.ToUpper();
         string envVarValue = Environment.GetEnvironmentVariable(envVarName);
         return envVarValue == null ? variable : float.Parse(envVarValue);
     }
 
-    protected bool LoadBoolVariable(bool variable, string name)
-    {
+    protected bool LoadBoolVariable(bool variable, string name) {
         string envVarName = ENVIRONMENT_PREFIX + name.ToUpper();
         string envVarValue = Environment.GetEnvironmentVariable(envVarName);
         return envVarValue == null ? variable : bool.Parse(envVarValue);
     }
 
-    public void SetCriticalErrorState()
-    {
+    public void SetCriticalErrorState() {
         this.agentManagerState = AgentState.Error;
     }
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class MultiAgentMetadata
-{
+public class MultiAgentMetadata {
     public MetadataWrapper[] agents;
     public ThirdPartyCameraMetadata[] thirdPartyCameras;
     public int activeAgentId;
@@ -2088,8 +1837,7 @@ public class MultiAgentMetadata
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ThirdPartyCameraMetadata
-{
+public class ThirdPartyCameraMetadata {
     public int thirdPartyCameraId;
     public Vector3 position;
     public Vector3 rotation;
@@ -2103,8 +1851,7 @@ public class ThirdPartyCameraMetadata
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class MetadataPatch
-{
+public class MetadataPatch {
     public string lastAction;
     public string errorMessage;
     public string errorCode;
@@ -2117,8 +1864,7 @@ public class MetadataPatch
 // overlap between ObjectMetadata and AgentMetadata
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class AgentMetadata
-{
+public class AgentMetadata {
     public string name;
     public Vector3 position;
     public Vector3 rotation;
@@ -2139,8 +1885,7 @@ public AgentMetadata() { }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class DroneAgentMetadata : AgentMetadata
-{
+public class DroneAgentMetadata : AgentMetadata {
     // why is the launcher position even attached to the agent's metadata
     // and not the generic metdata?
     public Vector3 launcherPosition;
@@ -2149,8 +1894,7 @@ public class DroneAgentMetadata : AgentMetadata
 // additional metadata for drone objects (only use with Drone controller)
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class DroneObjectMetadata : ObjectMetadata
-{
+public class DroneObjectMetadata : ObjectMetadata {
     // Drone Related Metadata
     public int numSimObjHits;
     public int numFloorHits;
@@ -2164,8 +1908,7 @@ public DroneObjectMetadata() { }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ObjectMetadata
-{
+public class ObjectMetadata {
     public string name;
     public Vector3 position;
     public Vector3 rotation;
@@ -2299,8 +2042,7 @@ public ObjectMetadata() { }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class MinimalObjectMetadata
-{
+public class MinimalObjectMetadata {
     public string name;
 
     // what type of object is this?
@@ -2317,8 +2059,7 @@ public MinimalObjectMetadata() { }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class SceneBounds
-{
+public class SceneBounds {
     // 8 corners of the world axis aligned box that bounds a sim object
     // 8 rows - 8 corners, one per row
     // 3 columns - x, y, z of each corner respectively
@@ -2335,8 +2076,7 @@ public class SceneBounds
 // if an object is rotated, the dimensions of this box are subject to change
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class AxisAlignedBoundingBox
-{
+public class AxisAlignedBoundingBox {
     // 8 corners of the world axis aligned box that bounds a sim object
     // 8 rows - 8 corners, one per row
     // 3 columns - x, y, z of each corner respectively
@@ -2353,8 +2093,7 @@ public class AxisAlignedBoundingBox
 // if an object is rotated, this object oriented box will not change dimensions
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ObjectOrientedBoundingBox
-{
+public class ObjectOrientedBoundingBox {
     // probably return these from the BoundingBox component of the object for now?
     // this means that it will only work for Pickupable objects at the moment
     public float[][] cornerPoints;
@@ -2362,32 +2101,28 @@ public class ObjectOrientedBoundingBox
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class InventoryObject
-{
+public class InventoryObject {
     public string objectId;
     public string objectType;
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ColorId
-{
+public class ColorId {
     public ushort[] color;
     public string name;
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ColorBounds
-{
+public class ColorBounds {
     public ushort[] color;
     public int[] bounds;
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class HandMetadata
-{
+public class HandMetadata {
     public Vector3 position;
     public Vector3 rotation;
     public Vector3 localPosition;
@@ -2396,8 +2131,7 @@ public class HandMetadata
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class JointMetadata
-{
+public class JointMetadata {
     public string name;
     public Vector3 position;
     public Vector3 rootRelativePosition;
@@ -2410,8 +2144,7 @@ public class JointMetadata
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ArmMetadata
-{
+public class ArmMetadata {
     // public Vector3 handTarget;
     // joints 1 to 4, joint 4 is the wrist and joint 1 is the base that never moves
     public JointMetadata[] joints;
@@ -2436,8 +2169,7 @@ public class ArmMetadata
     public float handSphereRadius;
 }
 
-public class ArticulationArmMetadata
-{
+public class ArticulationArmMetadata {
     //additional metadata for each joint in the articulated arm (currently base, extend joint, and wrist)
     public ArticulationJointMetadata[] joints;
 
@@ -2458,8 +2190,7 @@ public class ArticulationArmMetadata
 }
 
 //this should include the arm base, the extend joint, and wrist joint for now
-public class ArticulationJointMetadata
-{
+public class ArticulationJointMetadata {
     //string name of this joint
     public string name;
 
@@ -2491,21 +2222,18 @@ public class ArticulationJointMetadata
 }
 
 [Serializable]
-public class ObjectTypeCount
-{
+public class ObjectTypeCount {
     public string objectType; // specify object by type in scene
     public int count; // the total count of objects of type objectType that we will try to make exist in the scene
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ObjectPose
-{
+public class ObjectPose {
     public ObjectPose()
         : this("", new Vector3(), new Vector3()) { }
 
-    public ObjectPose(string objectName, Vector3 position, Vector3 rotation)
-    {
+    public ObjectPose(string objectName, Vector3 position, Vector3 rotation) {
         this.objectName = objectName;
         this.position = position;
         this.rotation = rotation;
@@ -2522,8 +2250,7 @@ public ObjectPose(string objectName, Vector3 position, Vector3 rotation)
 // also used to randomly do this ie: randomly slice all objects of type apple, randomly slice all objects that have sliceable property
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class SetObjectStates
-{
+public class SetObjectStates {
     public string objectType = null; // valid strings are any Object Type listed in documentation (ie: AlarmClock, Apple, etc)
     public string stateChange = null; // valid strings are: openable, toggleable, breakable, canFillWithLiquid, dirtyable, cookable, sliceable, canBeUsedUp
     public bool isOpen;
@@ -2538,8 +2265,7 @@ public class SetObjectStates
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public struct MetadataWrapper
-{
+public struct MetadataWrapper {
     public ObjectMetadata[] objects;
     public bool isSceneAtRest; // set true if all objects in the scene are at rest (or very very close to 0 velocity)
     public AgentMetadata agent;
@@ -2593,8 +2319,7 @@ Wraps the JObject created by JSON.net and used by the ActionDispatcher
 to dispatch to the appropriate action based on the passed in params.
 The properties(agentId, sequenceId, action) exist to encapsulate the key names.
 */
-public class DynamicServerAction
-{
+public class DynamicServerAction {
     // These parameters are allowed to exist as both parameters to an Action and as global
     // paramaters.  This also excludes them from the InvalidArgument logic used in the ActionDispatcher
     public static readonly IReadOnlyCollection<string> AllowedExtraneousParameters =
@@ -2617,47 +2342,37 @@ public class DynamicServerAction
 
     public JObject jObject { get; private set; }
 
-    public int agentId
-    {
+    public int agentId {
         get { return this.GetValue("agentId", 0); }
     }
 
-    public int sequenceId
-    {
+    public int sequenceId {
         get { return (int)this.GetValue("sequenceId", 0); }
     }
 
-    public string action
-    {
+    public string action {
         get { return this.jObject["action"].ToString(); }
     }
 
-    public PhysicsSimulationParams physicsSimulationParams
-    {
-        get
-        {
+    public PhysicsSimulationParams physicsSimulationParams {
+        get {
             return this.jObject[physicsSimulationParamsVariable]
                 ?.ToObject<PhysicsSimulationParams>();
         }
     }
 
-    public bool HasAgentInitializationParams()
-    {
+    public bool HasAgentInitializationParams() {
         return this.ContainsKey(agentInitializationParamsVariable);
     }
 
-    public DynamicServerAction agentInitializationParams
-    {
-        get
-        {
+    public DynamicServerAction agentInitializationParams {
+        get {
             var dict = this.jObject[agentInitializationParamsVariable]
                 ?.ToObject<Dictionary<string, object>>();
             dict ??= new Dictionary<string, object>();
-            foreach (var extraneousParam in AllowedExtraneousParameters)
-            {
+            foreach (var extraneousParam in AllowedExtraneousParameters) {
                 var parmaValue = this.GetValue(extraneousParam);
-                if (parmaValue != null)
-                {
+                if (parmaValue != null) {
                     dict.Add(
                         extraneousParam,
                         this.GetValue(extraneousParam) //?.ToObject<object>()
@@ -2668,93 +2383,73 @@ public DynamicServerAction agentInitializationParams
         }
     }
 
-    public int GetValue(string name, int defaultValue)
-    {
-        if (this.ContainsKey(name))
-        {
+    public int GetValue(string name, int defaultValue) {
+        if (this.ContainsKey(name)) {
             return (int)this.GetValue(name);
-        }
-        else
-        {
+        } else {
             return defaultValue;
         }
     }
 
-    public bool GetValue(string name, bool defaultValue)
-    {
-        if (this.ContainsKey(name))
-        {
+    public bool GetValue(string name, bool defaultValue) {
+        if (this.ContainsKey(name)) {
             return (bool)this.GetValue(name);
-        }
-        else
-        {
+        } else {
             return defaultValue;
         }
     }
 
-    public JToken GetValue(string name)
-    {
+    public JToken GetValue(string name) {
         return this.jObject.GetValue(name);
     }
 
-    public bool ContainsKey(string name)
-    {
+    public bool ContainsKey(string name) {
         return this.jObject.ContainsKey(name);
     }
 
-    public bool renderInstanceSegmentation
-    {
+    public bool renderInstanceSegmentation {
         get { return this.GetValue("renderInstanceSegmentation", false); }
     }
 
-    public bool renderImage
-    {
+    public bool renderImage {
         get { return this.GetValue("renderImage", true); }
     }
 
-    public bool renderImageSynthesis
-    {
+    public bool renderImageSynthesis {
         get { return this.GetValue("renderImageSynthesis", true); }
     }
 
-    public DynamicServerAction(Dictionary<string, object> action)
-    {
+    public DynamicServerAction(Dictionary<string, object> action) {
         var jsonResolver = new ShouldSerializeContractResolver();
         this.jObject = JObject.FromObject(
             action,
-            new Newtonsoft.Json.JsonSerializer()
-            {
+            new Newtonsoft.Json.JsonSerializer() {
                 ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                 ContractResolver = jsonResolver
             }
         );
     }
 
-    public DynamicServerAction(JObject action)
-    {
+    public DynamicServerAction(JObject action) {
         this.jObject = action;
     }
 
-    public DynamicServerAction(string jsonMessage)
-    {
+    public DynamicServerAction(string jsonMessage) {
         this.jObject = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(jsonMessage);
     }
 
-    public System.Object ToObject(Type objectType)
-    {
+    public System.Object ToObject(Type objectType) {
         return this.jObject.ToObject(objectType);
     }
 
-    public T ToObject<T>()
-    {
+    public T ToObject<T>() {
         return this.jObject.ToObject<T>();
     }
 
     // this is primarily used when detecting invalid arguments
     // if Initialize is ever changed we should refactor this since renderInstanceSegmentation is a
     // valid argument for Initialize as well as a global parameter
-    public IEnumerable<string> ArgumentKeys()
-    {
+    public IEnumerable<string> ArgumentKeys() {
         return this
             .jObject.Properties()
             .Select(p => p.Name)
@@ -2762,8 +2457,7 @@ public IEnumerable<string> ArgumentKeys()
             .ToList();
     }
 
-    public IEnumerable<string> ArgumentKeysWithPhysicsSimulationProperies()
-    {
+    public IEnumerable<string> ArgumentKeysWithPhysicsSimulationProperies() {
         return this
             .jObject.Properties()
             .Select(p => p.Name)
@@ -2775,55 +2469,45 @@ public IEnumerable<string> ArgumentKeysWithPhysicsSimulationProperies()
             .ToList();
     }
 
-    public IEnumerable<string> Keys()
-    {
+    public IEnumerable<string> Keys() {
         return this.jObject.Properties().Select(p => p.Name).ToList();
     }
 
-    public int Count()
-    {
+    public int Count() {
         return this.jObject.Count;
     }
 
-    public void AddPhysicsSimulationParams(PhysicsSimulationParams physicsSimulationParams)
-    {
+    public void AddPhysicsSimulationParams(PhysicsSimulationParams physicsSimulationParams) {
         var token = JToken.FromObject(physicsSimulationParams);
         this.jObject.Add(new JProperty(physicsSimulationParamsVariable, token));
     }
 }
 
 [Serializable]
-public class CameraParameters
-{
+public class CameraParameters {
     public float? fieldOfView;
     public Vector3? localEulerAngles;
     public float? nearPlane;
     public float? farPlane;
 
-    public static void setCameraParameters(Camera camera, CameraParameters parameters)
-    {
-        if (parameters.fieldOfView.HasValue)
-        {
+    public static void setCameraParameters(Camera camera, CameraParameters parameters) {
+        if (parameters.fieldOfView.HasValue) {
             camera.fieldOfView = parameters.fieldOfView.Value;
         }
-        if (parameters.nearPlane.HasValue)
-        {
+        if (parameters.nearPlane.HasValue) {
             camera.nearClipPlane = parameters.nearPlane.Value;
         }
-        if (parameters.farPlane.HasValue)
-        {
+        if (parameters.farPlane.HasValue) {
             camera.farClipPlane = parameters.farPlane.Value;
         }
-        if (parameters.localEulerAngles.HasValue)
-        {
+        if (parameters.localEulerAngles.HasValue) {
             camera.transform.localEulerAngles = parameters.localEulerAngles.Value;
         }
     }
 }
 
 [Serializable]
-public class ServerAction
-{
+public class ServerAction {
     public string action;
     public int agentCount = 1;
     public string quality;
@@ -2986,26 +2670,21 @@ public class ServerAction
 
     public Dictionary<string, CameraParameters> thirdPartyCameraParameters;
 
-    public SimObjType ReceptableSimObjType()
-    {
-        if (string.IsNullOrEmpty(receptacleObjectType))
-        {
+    public SimObjType ReceptableSimObjType() {
+        if (string.IsNullOrEmpty(receptacleObjectType)) {
             return SimObjType.Undefined;
         }
         return (SimObjType)Enum.Parse(typeof(SimObjType), receptacleObjectType);
     }
 
-    public static VisibilityScheme GetVisibilitySchemeFromString(string visibilityScheme)
-    {
+    public static VisibilityScheme GetVisibilitySchemeFromString(string visibilityScheme) {
         VisibilityScheme result = VisibilityScheme.Collider;
-        try
-        {
+        try {
             result = (VisibilityScheme)Enum.Parse(typeof(VisibilityScheme), visibilityScheme, true);
         }
         // including this pragma so the "ex variable declared but not used" warning stops yelling
 #pragma warning disable 0168
-        catch (ArgumentException ex)
-        {
+        catch (ArgumentException ex) {
 #pragma warning restore 0168
             Debug.LogError(
                 "Error parsing visibilityScheme: '" + visibilityScheme + "' defaulting to Collider"
@@ -3015,15 +2694,12 @@ public static VisibilityScheme GetVisibilitySchemeFromString(string visibilitySc
         return result;
     }
 
-    public VisibilityScheme GetVisibilityScheme()
-    {
+    public VisibilityScheme GetVisibilityScheme() {
         return GetVisibilitySchemeFromString(this.visibilityScheme);
     }
 
-    public SimObjType GetSimObjType()
-    {
-        if (string.IsNullOrEmpty(objectType))
-        {
+    public SimObjType GetSimObjType() {
+        if (string.IsNullOrEmpty(objectType)) {
             return SimObjType.Undefined;
         }
         return (SimObjType)Enum.Parse(typeof(SimObjType), objectType);
@@ -3031,29 +2707,25 @@ public SimObjType GetSimObjType()
 
     // allows this to be passed in as a dynamic which we then
     // cast back to itself
-    public ServerAction ToObject<T>()
-    {
+    public ServerAction ToObject<T>() {
         return this;
     }
 
-    public ServerAction ToObject(Type t)
-    {
+    public ServerAction ToObject(Type t) {
         return this;
     }
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class InitializeReturn
-{
+public class InitializeReturn {
     public float cameraNearPlane;
     public float cameraFarPlane;
 }
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class Geometry3D
-{
+public class Geometry3D {
     public Vector3[] vertices;
     public int[] triangleIndices;
     public Vector2[] uvs;
@@ -3062,8 +2734,7 @@ public class Geometry3D
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class ObjectSphereBounds
-{
+public class ObjectSphereBounds {
     public string id;
     public Vector3 worldSpaceCenter;
     public float radius;
@@ -3071,8 +2742,7 @@ public class ObjectSphereBounds
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class CapsuleData
-{
+public class CapsuleData {
     public Transform transform;
     public float radius;
 
@@ -3081,8 +2751,7 @@ public class CapsuleData
     public Vector3 center;
 }
 
-public class DebugSphere
-{
+public class DebugSphere {
     public Vector3 worldSpaceCenter;
     public float radius;
     public Color color;
@@ -3090,16 +2759,14 @@ public class DebugSphere
 
 [Serializable]
 [MessagePackObject(keyAsPropertyName: true)]
-public class Waypoint
-{
+public class Waypoint {
     public Vector3 position;
     public SerializableColor color;
     public float radius = 0.2f;
     public string text = "";
 }
 
-public enum ServerActionErrorCode
-{
+public enum ServerActionErrorCode {
     Undefined,
     ReceptacleNotVisible,
     ReceptacleNotOpen,
@@ -3120,14 +2787,12 @@ public enum ServerActionErrorCode
     UnhandledException
 }
 
-public enum VisibilityScheme
-{
+public enum VisibilityScheme {
     Collider,
     Distance
 }
 
-public enum Temperature
-{
+public enum Temperature {
     RoomTemp,
     Hot,
     Cold
@@ -3136,8 +2801,7 @@ public enum Temperature
 // Salient materials are only for pickupable and moveable objects,
 // for now static only objects do not report material back since we have to assign them manually
 // They are the materials that make up an object (ie: cell phone - metal, glass).
-public enum SalientObjectMaterial
-{
+public enum SalientObjectMaterial {
     Metal,
     Wood,
     Plastic,
@@ -3156,28 +2820,24 @@ public enum SalientObjectMaterial
 };
 
 [Serializable]
-public class ControllerInitialization
-{
+public class ControllerInitialization {
     public Dictionary<string, TypedVariable> variableInitializations;
 }
 
 [Serializable]
-public class TypedVariable
-{
+public class TypedVariable {
     public string type;
     public object value;
 }
 
-public class ShouldSerializeContractResolver : DefaultContractResolver
-{
+public class ShouldSerializeContractResolver : DefaultContractResolver {
     public static readonly ShouldSerializeContractResolver Instance =
         new ShouldSerializeContractResolver();
 
     protected override JsonProperty CreateProperty(
         MemberInfo member,
         MemberSerialization memberSerialization
-    )
-    {
+    ) {
         JsonProperty property = base.CreateProperty(member, memberSerialization);
 
         // exclude these properties to make serialization match JsonUtility
@@ -3188,30 +2848,24 @@ MemberSerialization memberSerialization
                 || property.PropertyName == "magnitude"
                 || property.PropertyName == "normalized"
             )
-        )
-        {
-            property.ShouldSerialize = instance =>
-            {
+        ) {
+            property.ShouldSerialize = instance => {
                 return false;
             };
             return property;
-        }
-        else
-        {
+        } else {
             return base.CreateProperty(member, memberSerialization);
         }
     }
 }
 
-public enum DepthFormat
-{
+public enum DepthFormat {
     Normalized,
     Meters,
     Millimeters
 }
 
-public enum AgentState
-{
+public enum AgentState {
     Processing,
     ActionComplete,
     PendingFixedUpdate,
diff --git a/unity/Assets/Scripts/Arm.cs b/unity/Assets/Scripts/Arm.cs
index 53a46a76aa..72579e6487 100644
--- a/unity/Assets/Scripts/Arm.cs
+++ b/unity/Assets/Scripts/Arm.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public interface Arm
-{
+public interface Arm {
     // void ContinuousUpdate();
     bool IsArmColliding();
 
diff --git a/unity/Assets/Scripts/ArmAgentController.cs b/unity/Assets/Scripts/ArmAgentController.cs
index 1e88df5339..5e3aea7317 100644
--- a/unity/Assets/Scripts/ArmAgentController.cs
+++ b/unity/Assets/Scripts/ArmAgentController.cs
@@ -7,10 +7,8 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public abstract class ArmAgentController : PhysicsRemoteFPSAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public abstract class ArmAgentController : PhysicsRemoteFPSAgentController {
         public ArmAgentController(BaseAgentComponent baseAgentComponent, AgentManager agentManager)
             : base(baseAgentComponent, agentManager) { }
 
@@ -19,24 +17,19 @@ public ArmAgentController(BaseAgentComponent baseAgentComponent, AgentManager ag
         /*
         Toggles the visibility of the magnet sphere at the end of the arm.
         */
-        public ActionFinished ToggleMagnetVisibility(bool? visible = null)
-        {
+        public ActionFinished ToggleMagnetVisibility(bool? visible = null) {
             MeshRenderer mr = GameObject
                 .Find("MagnetRenderer")
                 .GetComponentInChildren<MeshRenderer>();
-            if (visible.HasValue)
-            {
+            if (visible.HasValue) {
                 mr.enabled = visible.Value;
-            }
-            else
-            {
+            } else {
                 mr.enabled = !mr.enabled;
             }
             return ActionFinished.Success;
         }
 
-        public override void updateImageSynthesis(bool status)
-        {
+        public override void updateImageSynthesis(bool status) {
             base.updateImageSynthesis(status);
 
             // updateImageSynthesis is run in BaseFPSController's Initialize method after the
@@ -71,8 +64,7 @@ public IEnumerator MoveArmRelative(
             bool returnToStart = true,
             string coordinateSpace = "armBase",
             bool restrictMovement = false
-        )
-        {
+        ) {
             var arm = getArm();
             return arm.moveArmRelative(
                 controller: this,
@@ -91,8 +83,7 @@ public virtual IEnumerator MoveArm(
             bool returnToStart = true,
             string coordinateSpace = "armBase",
             bool restrictMovement = false
-        )
-        {
+        ) {
             var arm = getArm();
             return arm.moveArmTarget(
                 controller: this,
@@ -108,8 +99,7 @@ public virtual IEnumerator MoveArm(
         // perhaps this should fail if no object is picked up?
         // currently action success happens as long as the arm is
         // enabled because it is a successful "attempt" to pickup something
-        public IEnumerator PickupObject(List<string> objectIdCandidates = null)
-        {
+        public IEnumerator PickupObject(List<string> objectIdCandidates = null) {
             var arm = getArm();
             return arm.PickupObject(objectIdCandidates);
         }
@@ -119,8 +109,7 @@ public override void PickupObject(
             float y,
             bool forceAction = false,
             bool manualInteract = false
-        )
-        {
+        ) {
             throw new InvalidOperationException(
                 "You are passing in iTHOR PickupObject parameters (x, y) to the arm agent!"
             );
@@ -130,25 +119,21 @@ public override void PickupObject(
             string objectId,
             bool forceAction = false,
             bool manualInteract = false
-        )
-        {
+        ) {
             throw new InvalidOperationException(
                 "You are passing in iTHOR PickupObject parameters (objectId) to the arm agent!"
             );
         }
 
-        public IEnumerator ReleaseObject()
-        {
+        public IEnumerator ReleaseObject() {
             var arm = getArm();
             return arm.DropObject();
         }
 
         // note this does not reposition the center point of the magnet orb
         // so expanding the radius too much will cause it to clip backward into the wrist joint
-        public ActionFinished SetHandSphereRadius(float radius)
-        {
-            if (radius < 0.04f || radius > 0.5f)
-            {
+        public ActionFinished SetHandSphereRadius(float radius) {
+            if (radius < 0.04f || radius > 0.5f) {
                 throw new ArgumentOutOfRangeException(
                     $"radius={radius} of hand cannot be less than 0.04m nor greater than 0.5m"
                 );
@@ -164,10 +149,8 @@ public IEnumerator MoveAgent(
             float ahead = 0,
             float right = 0,
             float speed = 1
-        )
-        {
-            if (ahead == 0 && right == 0)
-            {
+        ) {
+            if (ahead == 0 && right == 0) {
                 throw new ArgumentException("Must specify ahead or right!");
             }
             Vector3 direction = new Vector3(x: right, y: 0, z: ahead);
@@ -195,8 +178,7 @@ public IEnumerator MoveAhead(
             float? moveMagnitude = null,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             return MoveAgent(
                 ahead: moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -208,8 +190,7 @@ public IEnumerator MoveBack(
             float? moveMagnitude = null,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             return MoveAgent(
                 ahead: -moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -221,8 +202,7 @@ public IEnumerator MoveRight(
             float? moveMagnitude = null,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             return MoveAgent(
                 right: moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -234,8 +214,7 @@ public IEnumerator MoveLeft(
             float? moveMagnitude = null,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             return MoveAgent(
                 right: -moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -247,8 +226,7 @@ public IEnumerator RotateRight(
             float? degrees = null,
             float speed = 1.0f,
             bool returnToStart = true
-        )
-        {
+        ) {
             return RotateAgent(
                 degrees: degrees.GetValueOrDefault(rotateStepDegrees),
                 speed: speed,
@@ -260,8 +238,7 @@ public IEnumerator RotateLeft(
             float? degrees = null,
             float speed = 1.0f,
             bool returnToStart = true
-        )
-        {
+        ) {
             return RotateAgent(
                 degrees: -degrees.GetValueOrDefault(rotateStepDegrees),
                 speed: speed,
@@ -273,8 +250,7 @@ public virtual IEnumerator RotateAgent(
             float degrees,
             float speed = 1.0f,
             bool returnToStart = true
-        )
-        {
+        ) {
             CollisionListener collisionListener = this.GetComponentInParent<CollisionListener>();
             collisionListener.Reset();
 
@@ -306,8 +282,7 @@ public virtual IEnumerator RotateWristRelative(
             float roll = 0f,
             float speed = 10f,
             bool returnToStart = true
-        )
-        {
+        ) {
             var arm = getArm();
             return arm.rotateWrist(
                 controller: this,
@@ -326,10 +301,8 @@ public virtual IEnumerator MoveArmBase(
             float speed = 1,
             bool returnToStart = true,
             bool normalizedY = true
-        )
-        {
-            if (normalizedY && (y < 0f || y > 1f))
-            {
+        ) {
+            if (normalizedY && (y < 0f || y > 1f)) {
                 // Checking for bounds when normalizedY == false is handled by arm.moveArmBase
                 throw new ArgumentOutOfRangeException(
                     $"y={y} value must be in [0, 1] when normalizedY=true."
@@ -351,8 +324,7 @@ public virtual IEnumerator MoveArmBaseUp(
             float distance,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             var arm = getArm();
             return arm.moveArmBaseUp(
                 controller: this,
@@ -367,31 +339,24 @@ public virtual IEnumerator MoveArmBaseDown(
             float distance,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             return MoveArmBaseUp(distance: -distance, speed: speed, returnToStart: returnToStart);
         }
 
 #if UNITY_EDITOR
         // debug for static arm collisions from collision listener
-        public void GetMidLevelArmCollisions()
-        {
+        public void GetMidLevelArmCollisions() {
             var arm = getArm();
             CollisionListener collisionListener = arm.GetComponentInChildren<CollisionListener>();
-            if (collisionListener != null)
-            {
+            if (collisionListener != null) {
                 List<Dictionary<string, string>> collisions =
                     new List<Dictionary<string, string>>();
-                foreach (var sc in collisionListener.StaticCollisions())
-                {
+                foreach (var sc in collisionListener.StaticCollisions()) {
                     Dictionary<string, string> element = new Dictionary<string, string>();
-                    if (sc.simObjPhysics != null)
-                    {
+                    if (sc.simObjPhysics != null) {
                         element["objectType"] = "simObjPhysics";
                         element["name"] = sc.simObjPhysics.objectID;
-                    }
-                    else
-                    {
+                    } else {
                         element["objectType"] = "gameObject";
                         element["name"] = sc.gameObject.name;
                     }
@@ -402,13 +367,11 @@ public void GetMidLevelArmCollisions()
         }
 
         // debug for static arm collisions from collision listener
-        public void DebugMidLevelArmCollisions()
-        {
+        public void DebugMidLevelArmCollisions() {
             var arm = getArm();
             List<StaticCollision> scs = arm.collisionListener.StaticCollisions().ToList();
             Debug.Log("Total current active static arm collisions: " + scs.Count);
-            foreach (StaticCollision sc in scs)
-            {
+            foreach (StaticCollision sc in scs) {
                 Debug.Log("Arm static collision: " + sc.name);
             }
             actionFinished(true);
diff --git a/unity/Assets/Scripts/ArmCollisionResolver.cs b/unity/Assets/Scripts/ArmCollisionResolver.cs
index d32e214fc7..00addb64c5 100644
--- a/unity/Assets/Scripts/ArmCollisionResolver.cs
+++ b/unity/Assets/Scripts/ArmCollisionResolver.cs
@@ -3,16 +3,14 @@
 using System.Linq;
 using UnityEngine;
 
-public class ArmCollisionResolver : CollisionEventResolver
-{
+public class ArmCollisionResolver : CollisionEventResolver {
     public Collider bodyColliderIgnore;
     public GameObject bodyCollidersParent;
 
     // TODO: Abstract arm api so that this class doesn't need to be duplicated for ik arm
     protected Stretch_Robot_Arm_Controller arm;
 
-    protected new void Start()
-    {
+    protected new void Start() {
         base.Start();
         arm = this.GetComponent<Stretch_Robot_Arm_Controller>();
         var collisionListener = this.GetComponentInParent<CollisionListener>();
@@ -21,33 +19,23 @@ public class ArmCollisionResolver : CollisionEventResolver
     public override StaticCollision resolveToStaticCollision(
         Collider externalCollider,
         HashSet<Collider> internalColliders
-    )
-    {
-        if (externalCollider.transform.parent != null)
-        {
-            if (externalCollider.transform.parent.gameObject.Equals(bodyCollidersParent))
-            {
+    ) {
+        if (externalCollider.transform.parent != null) {
+            if (externalCollider.transform.parent.gameObject.Equals(bodyCollidersParent)) {
                 // Collision with body
                 Debug.Log("-------- RESOLVED COLLISION WITH BODY");
-                return new StaticCollision()
-                {
+                return new StaticCollision() {
                     gameObject = externalCollider.transform.parent.gameObject
                 };
             }
         }
 
-        if (externalCollider.GetComponentInParent<Stretch_Robot_Arm_Controller>() != null)
-        {
-            if (internalColliders.Count == 1 && internalColliders.First() == bodyColliderIgnore)
-            {
+        if (externalCollider.GetComponentInParent<Stretch_Robot_Arm_Controller>() != null) {
+            if (internalColliders.Count == 1 && internalColliders.First() == bodyColliderIgnore) {
                 return null;
-            }
-            else
-            {
-                foreach (var objectColliderSet in arm.heldObjects.Values)
-                {
-                    if (objectColliderSet.Contains(externalCollider))
-                    {
+            } else {
+                foreach (var objectColliderSet in arm.heldObjects.Values) {
+                    if (objectColliderSet.Contains(externalCollider)) {
                         // Held-Object collision with aram
                         Debug.Log("-------- RESOLVED COLLISION WITH ARm");
                         return new StaticCollision() { gameObject = externalCollider.gameObject };
diff --git a/unity/Assets/Scripts/ArmController.cs b/unity/Assets/Scripts/ArmController.cs
index 8c7c132b2b..7e9a725746 100644
--- a/unity/Assets/Scripts/ArmController.cs
+++ b/unity/Assets/Scripts/ArmController.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public abstract class ArmController : MonoBehaviour, Arm, MovableContinuous
-{
+public abstract class ArmController : MonoBehaviour, Arm, MovableContinuous {
     [SerializeField]
     public Transform FinalJoint;
 
@@ -41,8 +40,7 @@ public abstract class ArmController : MonoBehaviour, Arm, MovableContinuous
 
     protected bool ignoreHeldObjectToAgentCollisions = false;
 
-    protected virtual bool validArmTargetPosition(Vector3 targetWorldPosition)
-    {
+    protected virtual bool validArmTargetPosition(Vector3 targetWorldPosition) {
         return true;
     }
 
@@ -58,8 +56,7 @@ protected virtual bool validArmTargetPosition(Vector3 targetWorldPosition)
 
     public abstract void ContinuousUpdate(float fixedDeltaTime);
 
-    public virtual ActionFinished FinishContinuousMove(BaseFPSAgentController controller)
-    {
+    public virtual ActionFinished FinishContinuousMove(BaseFPSAgentController controller) {
         bool actionSuccess = !this.ShouldHalt();
         string errorMessage = this.GetHaltMessage();
 
@@ -79,28 +76,23 @@ public virtual ActionFinished FinishContinuousMove(BaseFPSAgentController contro
     public abstract GameObject GetArmTarget();
     public abstract ArmMetadata GenerateMetadata();
 
-    public virtual bool ShouldHalt()
-    {
+    public virtual bool ShouldHalt() {
         return collisionListener.ShouldHalt();
     }
 
-    public Vector3 MagnetSphereWorldCenter()
-    {
+    public Vector3 MagnetSphereWorldCenter() {
         return magnetSphere.transform.TransformPoint(magnetSphere.center);
     }
 
-    public virtual string GetHaltMessage()
-    {
+    public virtual string GetHaltMessage() {
         var staticCollisions = collisionListener?.StaticCollisions().ToList();
 
         // decide if we want to return to original property or last known property before collision
-        if (staticCollisions.Count > 0)
-        {
+        if (staticCollisions.Count > 0) {
             var sc = staticCollisions[0];
 
             // if we hit a sim object
-            if (sc.isSimObj)
-            {
+            if (sc.isSimObj) {
                 return "Collided with static/kinematic sim object: '"
                     + sc.simObjPhysics.name
                     + "', could not reach target: '"
@@ -109,8 +101,7 @@ public virtual string GetHaltMessage()
             }
 
             // if we hit a structural object that isn't a sim object but still has static collision
-            if (!sc.isSimObj)
-            {
+            if (!sc.isSimObj) {
                 return "Collided with static structure in scene: '"
                     + sc.gameObject.name
                     + "', could not reach target: '"
@@ -123,23 +114,19 @@ public virtual string GetHaltMessage()
 
     // public virtual ActionFinished FinishContinuousMove(
 
-    public bool IsArmColliding()
-    {
+    public bool IsArmColliding() {
         HashSet<Collider> colliders = this.currentArmCollisions();
         return colliders.Count > 0;
     }
 
-    public IEnumerator withLastStepCallback(IEnumerator steps)
-    {
-        while (steps.MoveNext())
-        {
+    public IEnumerator withLastStepCallback(IEnumerator steps) {
+        while (steps.MoveNext()) {
             yield return steps.Current;
         }
         lastStepCallback();
     }
 
-    public HashSet<Collider> currentArmCollisions()
-    {
+    public HashSet<Collider> currentArmCollisions() {
         HashSet<Collider> colliders = new HashSet<Collider>();
 
         // add the AgentCapsule to the ArmCapsuleColliders for the capsule collider check
@@ -149,10 +136,8 @@ public HashSet<Collider> currentArmCollisions()
         capsules.Add(agentCapsuleCollider);
 
         // create overlap box/capsule for each collider and check the result I guess
-        foreach (CapsuleCollider c in capsules)
-        {
-            if (c.isTrigger || !c.gameObject.active)
-            {
+        foreach (CapsuleCollider c in capsules) {
+            if (c.isTrigger || !c.gameObject.active) {
                 continue;
             }
 
@@ -162,8 +147,7 @@ public HashSet<Collider> currentArmCollisions()
             // direction of CapsuleCollider's orientation in local space
             Vector3 dir = new Vector3();
 
-            switch (c.direction)
-            {
+            switch (c.direction) {
                 // x just in case
                 case 0:
                     // get world space direction of this capsule's local right vector
@@ -220,17 +204,14 @@ public HashSet<Collider> currentArmCollisions()
                 ),
                 queryTriggerInteraction: QueryTriggerInteraction.Ignore
             );
-            foreach (Collider col in cols)
-            {
+            foreach (Collider col in cols) {
                 colliders.Add(col);
             }
         }
 
         // also check if the couple of box colliders are colliding
-        foreach (BoxCollider b in ArmBoxColliders)
-        {
-            if (b.isTrigger || !b.gameObject.active)
-            {
+        foreach (BoxCollider b in ArmBoxColliders) {
+            if (b.isTrigger || !b.gameObject.active) {
                 continue;
             }
             Collider[] cols = Physics.OverlapBox(
@@ -246,8 +227,7 @@ public HashSet<Collider> currentArmCollisions()
                 ),
                 queryTriggerInteraction: QueryTriggerInteraction.Ignore
             );
-            foreach (Collider col in cols)
-            {
+            foreach (Collider col in cols) {
                 colliders.Add(col);
             }
         }
@@ -262,11 +242,9 @@ public virtual IEnumerator moveArmRelative(
         bool returnToStart,
         string coordinateSpace,
         bool restrictTargetPosition
-    )
-    {
+    ) {
         Vector3 offsetWorldPos;
-        switch (coordinateSpace)
-        {
+        switch (coordinateSpace) {
             case "world":
                 // world space, can be used to move directly toward positions
                 // returned by sim objects
@@ -302,8 +280,7 @@ public virtual IEnumerator moveArmTarget(
         bool returnToStart,
         string coordinateSpace,
         bool restrictTargetPosition
-    )
-    {
+    ) {
         // clearing out colliders here since OnTriggerExit is not consistently called in Editor
         collisionListener.Reset();
 
@@ -311,8 +288,7 @@ bool restrictTargetPosition
 
         // Move arm based on hand space or arm origin space
         Vector3 targetWorldPos;
-        switch (coordinateSpace)
-        {
+        switch (coordinateSpace) {
             case "world":
                 // world space, can be used to move directly toward positions
                 // returned by sim objects
@@ -330,8 +306,7 @@ bool restrictTargetPosition
                 throw new ArgumentException("Invalid coordinateSpace: " + coordinateSpace);
         }
 
-        if (restrictTargetPosition && !validArmTargetPosition(targetWorldPos))
-        {
+        if (restrictTargetPosition && !validArmTargetPosition(targetWorldPos)) {
             throw new InvalidOperationException(
                 $"Invalid target: Position '{target}' in space '{coordinateSpace}' is behind shoulder."
             );
@@ -358,8 +333,7 @@ public virtual IEnumerator moveArmBase(
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed,
         bool normalizedY
-    )
-    {
+    ) {
         // clearing out colliders here since OnTriggerExit is not consistently called in Editor
         collisionListener.Reset();
 
@@ -370,13 +344,11 @@ bool normalizedY
             maxY;
         getCapsuleMinMaxY(controller, out minY, out maxY);
 
-        if (normalizedY)
-        {
+        if (normalizedY) {
             height = (maxY - minY) * height + minY;
         }
 
-        if (height < minY || height > maxY)
-        {
+        if (height < minY || height > maxY) {
             throw new ArgumentOutOfRangeException(
                 $"height={height} value must be in [{minY}, {maxY}]."
             );
@@ -401,8 +373,7 @@ private void getCapsuleMinMaxY(
         PhysicsRemoteFPSAgentController controller,
         out float minY,
         out float maxY
-    )
-    {
+    ) {
         CapsuleCollider cc = controller.GetComponent<CapsuleCollider>();
         Vector3 capsuleWorldCenter = cc.transform.TransformPoint(cc.center);
 
@@ -416,8 +387,7 @@ public virtual IEnumerator moveArmBaseUp(
         float unitsPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed
-    )
-    {
+    ) {
         // clearing out colliders here since OnTriggerExit is not consistently called in Editor
         collisionListener.Reset();
 
@@ -445,8 +415,7 @@ public virtual IEnumerator rotateWrist(
         float degreesPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed
-    )
-    {
+    ) {
         collisionListener.Reset();
         return withLastStepCallback(
             ContinuousMovement.rotate(
@@ -461,20 +430,17 @@ bool returnToStartPositionIfFailed
         );
     }
 
-    public List<SimObjPhysics> WhatObjectsAreInsideMagnetSphereAsSOP(bool onlyPickupable)
-    {
+    public List<SimObjPhysics> WhatObjectsAreInsideMagnetSphereAsSOP(bool onlyPickupable) {
         //Debug.Log("calling WhatObjectsAreInsideMagnetSphereAsSOP");
         return magnetSphereComp.CurrentlyContainedSimObjects(onlyPickupable: onlyPickupable);
     }
 
     public IEnumerator ReturnObjectsInMagnetAfterPhysicsUpdate(
         PhysicsRemoteFPSAgentController controller
-    )
-    {
+    ) {
         yield return new WaitForFixedUpdate();
         List<string> listOfSOP = new List<string>();
-        foreach (SimObjPhysics sop in this.WhatObjectsAreInsideMagnetSphereAsSOP(false))
-        {
+        foreach (SimObjPhysics sop in this.WhatObjectsAreInsideMagnetSphereAsSOP(false)) {
             listOfSOP.Add(sop.ObjectID);
         }
         Debug.Log("objs: " + string.Join(", ", listOfSOP));
@@ -485,18 +451,15 @@ private Dictionary<GameObject, Vector3> getGameObjectToMultipliedScale(
         GameObject go,
         Vector3 currentScale,
         Dictionary<GameObject, Vector3> gameObjectToScale = null
-    )
-    {
-        if (gameObjectToScale == null)
-        {
+    ) {
+        if (gameObjectToScale == null) {
             gameObjectToScale = new Dictionary<GameObject, Vector3>();
         }
 
         currentScale = Vector3.Scale(currentScale, go.transform.localScale);
         gameObjectToScale[go] = currentScale;
 
-        foreach (Transform child in go.transform)
-        {
+        foreach (Transform child in go.transform) {
             getGameObjectToMultipliedScale(
                 go: child.gameObject,
                 currentScale: currentScale,
@@ -507,19 +470,15 @@ private Dictionary<GameObject, Vector3> getGameObjectToMultipliedScale(
         return gameObjectToScale;
     }
 
-    public virtual IEnumerator PickupObject(List<string> objectIds)
-    {
+    public virtual IEnumerator PickupObject(List<string> objectIds) {
         // var at = this.transform.InverseTransformPoint(armTarget.position) - new Vector3(0, 0, originToShoulderLength);
         // Debug.Log("Pickup " + at.magnitude);
         bool pickedUp = false;
 
         // grab all sim objects that are currently colliding with magnet sphere
-        foreach (SimObjPhysics sop in WhatObjectsAreInsideMagnetSphereAsSOP(onlyPickupable: true))
-        {
-            if (objectIds != null)
-            {
-                if (!objectIds.Contains(sop.objectID))
-                {
+        foreach (SimObjPhysics sop in WhatObjectsAreInsideMagnetSphereAsSOP(onlyPickupable: true)) {
+            if (objectIds != null) {
+                if (!objectIds.Contains(sop.objectID)) {
                     continue;
                 }
             }
@@ -535,8 +494,7 @@ public virtual IEnumerator PickupObject(List<string> objectIds)
             rb.collisionDetectionMode = CollisionDetectionMode.Discrete;
             rb.detectCollisions = false; // Disable detecting of collisions
 
-            if (sop.IsOpenable)
-            {
+            if (sop.IsOpenable) {
                 CanOpen_Object coj = sop.gameObject.GetComponent<CanOpen_Object>();
 
                 // if an openable object receives OnTriggerEnter events
@@ -549,8 +507,7 @@ public virtual IEnumerator PickupObject(List<string> objectIds)
             // and parent them to the correct joint
             HashSet<Collider> cols = new HashSet<Collider>();
 
-            foreach (Collider c in sop.MyColliders)
-            {
+            foreach (Collider c in sop.MyColliders) {
                 // One set of colliders are used to check collisions
                 // with kinematic objects
                 Collider clone = Instantiate(
@@ -587,20 +544,15 @@ public virtual IEnumerator PickupObject(List<string> objectIds)
             Debug.Log(
                 $"------- ignoreHeldObjectToAgentCollisions {ignoreHeldObjectToAgentCollisions}"
             );
-            if (ignoreHeldObjectToAgentCollisions)
-            {
-                foreach (Collider c0 in colliders)
-                {
-                    foreach (Collider c1 in cols)
-                    {
+            if (ignoreHeldObjectToAgentCollisions) {
+                foreach (Collider c0 in colliders) {
+                    foreach (Collider c1 in cols) {
                         Physics.IgnoreCollision(c0, c1);
                     }
                 }
             }
-            foreach (Collider c0 in cols)
-            {
-                foreach (Collider c1 in cols)
-                {
+            foreach (Collider c0 in cols) {
+                foreach (Collider c1 in cols) {
                     Physics.IgnoreCollision(c0, c1);
                 }
             }
@@ -610,8 +562,7 @@ public virtual IEnumerator PickupObject(List<string> objectIds)
         }
 
         var errorMessage = "";
-        if (!pickedUp)
-        {
+        if (!pickedUp) {
             errorMessage = (
                 objectIds != null
                     ? "No objects (specified by objectId) were valid to be picked up by the arm"
@@ -624,18 +575,15 @@ public virtual IEnumerator PickupObject(List<string> objectIds)
         yield return new ActionFinished() { success = pickedUp, errorMessage = errorMessage };
     }
 
-    public virtual IEnumerator DropObject()
-    {
+    public virtual IEnumerator DropObject() {
         // grab all sim objects that are currently colliding with magnet sphere
-        foreach (KeyValuePair<SimObjPhysics, HashSet<Collider>> sop in heldObjects)
-        {
+        foreach (KeyValuePair<SimObjPhysics, HashSet<Collider>> sop in heldObjects) {
             Rigidbody rb = sop.Key.GetComponent<Rigidbody>();
             rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
             rb.isKinematic = false;
 
             // delete cloned colliders
-            foreach (Collider c in sop.Value)
-            {
+            foreach (Collider c in sop.Value) {
                 Destroy(c.gameObject);
             }
 
@@ -646,20 +594,16 @@ public virtual IEnumerator DropObject()
             //     c.enabled = true;
             // }
 
-            if (sop.Key.IsOpenable)
-            {
+            if (sop.Key.IsOpenable) {
                 CanOpen_Object coj = sop.Key.gameObject.GetComponent<CanOpen_Object>();
                 coj.triggerEnabled = true;
             }
 
             GameObject topObject = GameObject.Find("Objects");
 
-            if (topObject != null)
-            {
+            if (topObject != null) {
                 sop.Key.transform.parent = topObject.transform;
-            }
-            else
-            {
+            } else {
                 sop.Key.transform.parent = null;
             }
 
@@ -672,8 +616,7 @@ public virtual IEnumerator DropObject()
         yield return ActionFinished.Success;
     }
 
-    public void SetHandSphereRadius(float radius)
-    {
+    public void SetHandSphereRadius(float radius) {
         // Magnet.transform.localScale = new Vector3(radius, radius, radius);
         magnetSphere.radius = radius;
         MagnetRenderer.transform.localScale = new Vector3(2 * radius, 2 * radius, 2 * radius);
diff --git a/unity/Assets/Scripts/ArticulatedAgentController.cs b/unity/Assets/Scripts/ArticulatedAgentController.cs
index 0861d7c060..618ccb4f6a 100644
--- a/unity/Assets/Scripts/ArticulatedAgentController.cs
+++ b/unity/Assets/Scripts/ArticulatedAgentController.cs
@@ -7,10 +7,8 @@
 using UnityEngine.AI;
 using UnityEngine.Rendering.PostProcessing;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public partial class ArticulatedAgentController : ArmAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public partial class ArticulatedAgentController : ArmAgentController {
         public ArticulatedAgentController(
             BaseAgentComponent baseAgentComponent,
             AgentManager agentManager
@@ -27,30 +25,24 @@ AgentManager agentManager
 
         private CapsuleData originalCapsule;
 
-        protected override CapsuleData GetAgentCapsule()
-        {
+        protected override CapsuleData GetAgentCapsule() {
             Debug.Log("calling Override GetAgentCapsule in ArticulatedAgentController");
-            if (originalCapsule == null)
-            {
+            if (originalCapsule == null) {
                 var cc = this.GetComponent<CapsuleCollider>();
 
-                return new CapsuleData
-                {
+                return new CapsuleData {
                     radius = cc.radius,
                     height = cc.height,
                     center = cc.center,
                     transform = cc.transform
                 };
-            }
-            else
-            {
+            } else {
                 return originalCapsule;
             }
         }
 
         // TODO: Reimplement for Articulation body
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             // TODO; Articulation Body init
             VisibilityCapsule = StretchVisCap;
             m_CharacterController.center = new Vector3(0, 1.5f, 0);
@@ -63,8 +55,7 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
 
             // TODO: REMOVE
             CapsuleCollider cc = this.GetComponent<CapsuleCollider>();
-            originalCapsule = new CapsuleData
-            {
+            originalCapsule = new CapsuleData {
                 radius = cc.radius,
                 height = cc.height,
                 center = cc.center,
@@ -94,16 +85,13 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             // fp_camera_2.transform.localEulerAngles = new Vector3(45f, 90f, 0f);
             // fp_camera_2.fieldOfView = 90f;
 
-            if (initializeAction != null)
-            {
-                if (initializeAction.cameraNearPlane > 0)
-                {
+            if (initializeAction != null) {
+                if (initializeAction.cameraNearPlane > 0) {
                     m_Camera.nearClipPlane = initializeAction.cameraNearPlane;
                     // fp_camera_2.nearClipPlane = initializeAction.cameraNearPlane;
                 }
 
-                if (initializeAction.cameraFarPlane > 0)
-                {
+                if (initializeAction.cameraFarPlane > 0) {
                     m_Camera.farClipPlane = initializeAction.cameraFarPlane;
                     // fp_camera_2.farClipPlane = initializeAction.cameraFarPlane;
                 }
@@ -140,11 +128,9 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             return ActionFinished.Success;
         }
 
-        private ArticulatedArmController getArmImplementation()
-        {
+        private ArticulatedArmController getArmImplementation() {
             ArticulatedArmController arm = GetComponentInChildren<ArticulatedArmController>();
-            if (arm == null)
-            {
+            if (arm == null) {
                 throw new InvalidOperationException(
                     "Agent does not havSe Stretch arm or is not enabled.\n"
                         + $"Make sure there is a '{typeof(ArticulatedArmController).Name}' component as a child of this agent."
@@ -153,15 +139,12 @@ private ArticulatedArmController getArmImplementation()
             return arm;
         }
 
-        protected override ArmController getArm()
-        {
+        protected override ArmController getArm() {
             return getArmImplementation();
         }
 
-        public IEnumerator setFloorToHighFrictionAsLastStep(IEnumerator steps)
-        {
-            while (steps.MoveNext())
-            {
+        public IEnumerator setFloorToHighFrictionAsLastStep(IEnumerator steps) {
+            while (steps.MoveNext()) {
                 yield return steps.Current;
             }
             SetFloorColliderToHighFriction();
@@ -171,8 +154,7 @@ public override IEnumerator MoveArmBaseUp(
             float distance,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             Debug.Log("MoveArmBaseUp from ArticulatedAgentController");
             SetFloorColliderToHighFriction();
             var arm = getArmImplementation();
@@ -192,8 +174,7 @@ public IEnumerator MoveArmBaseUp(
             bool useLimits,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             Debug.Log("MoveArmBaseUp from ArticulatedAgentController");
             SetFloorColliderToHighFriction();
             var arm = getArmImplementation();
@@ -211,8 +192,7 @@ public override IEnumerator MoveArmBaseDown(
             float distance,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             Debug.Log(
                 "MoveArmBaseDown from ArticulatedAgentController (pass negative distance to MoveArmBaseUp)"
             );
@@ -230,8 +210,7 @@ public IEnumerator MoveArmBaseDown(
             bool useLimits,
             float speed = 1,
             bool returnToStart = true
-        )
-        {
+        ) {
             Debug.Log(
                 "MoveArmBaseDown from ArticulatedAgentController (pass negative distance to MoveArmBaseUp)"
             );
@@ -249,8 +228,7 @@ public override IEnumerator MoveArm(
             bool returnToStart = true,
             string coordinateSpace = "armBase",
             bool restrictMovement = false
-        )
-        {
+        ) {
             var arm = getArmImplementation();
             SetFloorColliderToHighFriction();
             return arm.moveArmTarget(
@@ -262,8 +240,7 @@ public override IEnumerator MoveArm(
         }
 
         //move arm overload with limits
-        public IEnumerator MoveArm(Vector3 position, bool useLimits, float speed = 1)
-        {
+        public IEnumerator MoveArm(Vector3 position, bool useLimits, float speed = 1) {
             var arm = getArmImplementation();
             SetFloorColliderToHighFriction();
             return arm.moveArmTarget(
@@ -276,16 +253,14 @@ public IEnumerator MoveArm(Vector3 position, bool useLimits, float speed = 1)
         }
 
         //helper functions to set physics material values
-        public void SetFloorColliderToSlippery()
-        {
+        public void SetFloorColliderToSlippery() {
             FloorColliderPhysicsMaterial.staticFriction = 0;
             FloorColliderPhysicsMaterial.frictionCombine = PhysicMaterialCombine.Minimum; //ensure min friction take priority
 
             //FloorColliderPhysicsMaterial.dynamicFriction = 0;
         }
 
-        public void SetFloorColliderToHighFriction()
-        {
+        public void SetFloorColliderToHighFriction() {
             FloorColliderPhysicsMaterial.staticFriction = 1;
             FloorColliderPhysicsMaterial.frictionCombine = PhysicMaterialCombine.Maximum; //ensure max friction takes priority
             //FloorColliderPhysicsMaterial.dynamicFriction = 1;
@@ -296,17 +271,14 @@ public void TeleportFull(
             Vector3 rotation,
             float? horizon = null,
             bool forceAction = false
-        )
-        {
+        ) {
             Debug.Log($"Original Position: {this.transform.position}");
 
-            if (horizon == null)
-            {
+            if (horizon == null) {
                 horizon = m_Camera.transform.localEulerAngles.x;
             }
 
-            if (!forceAction && (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle))
-            {
+            if (!forceAction && (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle)) {
                 throw new ArgumentOutOfRangeException(
                     $"Each horizon must be in [{-maxUpwardLookAngle}:{maxDownwardLookAngle}]. You gave {horizon}."
                 );
@@ -322,8 +294,7 @@ public void TeleportFull(
             );
         }
 
-        IEnumerator TeleportThenWait(Vector3 position, Quaternion rotation, float cameraHorizon)
-        {
+        IEnumerator TeleportThenWait(Vector3 position, Quaternion rotation, float cameraHorizon) {
             Debug.Log("TeleportThenWait coroutine starting");
             ArticulationBody myBody = this.GetComponent<ArticulationBody>();
             myBody.TeleportRoot(position, rotation);
@@ -344,8 +315,7 @@ public override void GetInteractablePoses(
             bool[] standings = null,
             float? maxDistance = null,
             int maxPoses = int.MaxValue // works like infinity
-        )
-        {
+        ) {
             getInteractablePosesAB(
                 objectId: objectId,
                 markActionFinished: true,
@@ -367,12 +337,10 @@ public void getInteractablePosesAB(
             bool[] standings = null,
             float? maxDistance = null,
             int maxPoses = int.MaxValue // works like infinity
-        )
-        {
+        ) {
             Debug.Log("Calling getInteractablePosesAB");
 
-            if (standings != null)
-            {
+            if (standings != null) {
                 errorMessage =
                     "Articulation Agent does not support 'standings' for GetInteractablePoses";
                 throw new InvalidActionException();
@@ -381,47 +349,35 @@ public void getInteractablePosesAB(
             Debug.Log(
                 $"Position of agent at start of getInteractablePosesAB: {this.transform.position}"
             );
-            if (360 % rotateStepDegrees != 0 && rotations != null)
-            {
+            if (360 % rotateStepDegrees != 0 && rotations != null) {
                 throw new InvalidOperationException(
                     $"360 % rotateStepDegrees (360 % {rotateStepDegrees} != 0) must be 0, unless 'rotations: float[]' is overwritten."
                 );
             }
 
-            if (maxPoses <= 0)
-            {
+            if (maxPoses <= 0) {
                 throw new ArgumentOutOfRangeException("maxPoses must be > 0.");
             }
 
             // default "visibility" distance
             float maxDistanceFloat;
-            if (maxDistance == null)
-            {
+            if (maxDistance == null) {
                 maxDistanceFloat = maxVisibleDistance;
-            }
-            else if ((float)maxDistance <= 0)
-            {
+            } else if ((float)maxDistance <= 0) {
                 throw new ArgumentOutOfRangeException(
                     "maxDistance must be >= 0 meters from the object."
                 );
-            }
-            else
-            {
+            } else {
                 maxDistanceFloat = (float)maxDistance;
             }
 
             // populate default horizons
-            if (horizons == null)
-            {
+            if (horizons == null) {
                 horizons = new float[] { -30, 0, 30, 60 };
-            }
-            else
-            {
-                foreach (float horizon in horizons)
-                {
+            } else {
+                foreach (float horizon in horizons) {
                     // recall that horizon=60 is look down 60 degrees and horizon=-30 is look up 30 degrees
-                    if (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle)
-                    {
+                    if (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle) {
                         throw new ArgumentException(
                             $"Each horizon must be in [{-maxUpwardLookAngle}:{maxDownwardLookAngle}]. You gave {horizon}."
                         );
@@ -430,8 +386,7 @@ public void getInteractablePosesAB(
             }
 
             // populate the rotations based on rotateStepDegrees
-            if (rotations == null)
-            {
+            if (rotations == null) {
                 // Consider the case where one does not want to move on a perfect grid, and is currently moving
                 // with an offsetted set of rotations like {10, 100, 190, 280} instead of the default {0, 90, 180, 270}.
                 // This may happen if the agent starts by teleports with the rotation of 10 degrees.
@@ -446,8 +401,7 @@ public void getInteractablePosesAB(
                     float rotation = offset;
                     rotation < 360 + offset;
                     rotation += rotateStepDegrees
-                )
-                {
+                ) {
                     rotations[i++] = rotation;
                 }
             }
@@ -458,8 +412,7 @@ public void getInteractablePosesAB(
             );
 
             // populate the positions by those that are reachable
-            if (positions == null)
-            {
+            if (positions == null) {
                 positions = getReachablePositions();
             }
 
@@ -468,8 +421,7 @@ public void getInteractablePosesAB(
             // which is then used to filter the set of all reachable positions to just those plausible positions.
             Bounds objectBounds = UtilityFunctions.CreateEmptyBounds();
             objectBounds.Encapsulate(theObject.transform.position);
-            foreach (Transform vp in theObject.VisibilityPoints)
-            {
+            foreach (Transform vp in theObject.VisibilityPoints) {
                 objectBounds.Encapsulate(vp.position);
             }
             float fudgeFactor = objectBounds.extents.magnitude;
@@ -514,26 +466,22 @@ IEnumerator TeleportThenWaitThenCheckInteractable(
             Vector3 oldPosition,
             Vector3 oldHorizon,
             Quaternion oldRotation
-        )
-        {
+        ) {
             // set each key to store a list
             List<Dictionary<string, object>> validAgentPoses =
                 new List<Dictionary<string, object>>();
 
             bool stopEarly = false;
-            foreach (float horizon in horizons)
-            {
+            foreach (float horizon in horizons) {
                 m_Camera.transform.localEulerAngles = new Vector3(horizon, 0f, 0f);
                 Debug.Log($"camera horizon set to: {m_Camera.transform.localEulerAngles.x}");
 
-                foreach (float rotation in rotations)
-                {
+                foreach (float rotation in rotations) {
                     Vector3 rotationVector = new Vector3(x: 0, y: rotation, z: 0);
                     //SetTransform(transform: transform, rotation: (Quaternion?)Quaternion.Euler(rotationVector));
                     //yield return new WaitForFixedUpdate();
 
-                    foreach (Vector3 position in filteredPositions)
-                    {
+                    foreach (Vector3 position in filteredPositions) {
                         Debug.Log("////////////////////");
                         Debug.Log($"position Before SetTransform: {transform.position}");
                         Debug.Log(
@@ -550,11 +498,9 @@ Quaternion oldRotation
 
                         // Each of these values is directly compatible with TeleportFull
                         // and should be used with .step(action='TeleportFull', **interactable_positions[0])
-                        if (objectIsCurrentlyVisible(theObject, maxDistanceFloat))
-                        {
+                        if (objectIsCurrentlyVisible(theObject, maxDistanceFloat)) {
                             validAgentPoses.Add(
-                                new Dictionary<string, object>
-                                {
+                                new Dictionary<string, object> {
                                     ["x"] = position.x,
                                     ["y"] = position.y,
                                     ["z"] = position.z,
@@ -563,8 +509,7 @@ Quaternion oldRotation
                                 }
                             );
 
-                            if (validAgentPoses.Count >= maxPoses)
-                            {
+                            if (validAgentPoses.Count >= maxPoses) {
                                 stopEarly = true;
                                 break;
                             }
@@ -580,13 +525,11 @@ Quaternion oldRotation
 #endif
                         }
                     }
-                    if (stopEarly)
-                    {
+                    if (stopEarly) {
                         break;
                     }
                 }
-                if (stopEarly)
-                {
+                if (stopEarly) {
                     break;
                 }
             }
@@ -617,36 +560,30 @@ public IEnumerator MoveAgent(
             float moveMagnitude = 1,
             float speed = 1,
             float acceleration = 1
-        )
-        {
+        ) {
             // Debug.Log("(3) ArticulatedAgentController: PREPPING MOVEAGENT COMMAND");
             int direction = 0;
-            if (moveMagnitude < 0)
-            {
+            if (moveMagnitude < 0) {
                 direction = -1;
             }
-            if (moveMagnitude > 0)
-            {
+            if (moveMagnitude > 0) {
                 direction = 1;
             }
 
             Debug.Log("Move magnitude is now officially " + moveMagnitude);
             // Debug.Log($"preparing agent {this.transform.name} to move");
-            if (Mathf.Approximately(moveMagnitude, 0.0f))
-            {
+            if (Mathf.Approximately(moveMagnitude, 0.0f)) {
                 Debug.Log("Error! distance to move must be nonzero");
                 // yield return nests the iterator structure because C# compiler forces
                 // to use yield return below and creates a nested Monad, (yield return (yield return val))
                 // better to return with .GetEnumerator();
-                return new ActionFinished()
-                {
+                return new ActionFinished() {
                     success = false,
                     errorMessage = "Error! distance to move must be nonzero"
                 }.GetEnumerator();
             }
 
-            AgentMoveParams amp = new AgentMoveParams
-            {
+            AgentMoveParams amp = new AgentMoveParams {
                 agentState = ABAgentState.Moving,
                 distance = Mathf.Abs(moveMagnitude),
                 speed = speed,
@@ -676,8 +613,7 @@ public IEnumerator MoveAhead(
             float? moveMagnitude = null,
             float speed = 0.14f,
             float acceleration = 0.14f
-        )
-        {
+        ) {
             return MoveAgent(
                 moveMagnitude: moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -689,8 +625,7 @@ public IEnumerator MoveBack(
             float? moveMagnitude = null,
             float speed = 0.14f,
             float acceleration = 0.14f
-        )
-        {
+        ) {
             return MoveAgent(
                 moveMagnitude: -moveMagnitude.GetValueOrDefault(gridSize),
                 speed: speed,
@@ -702,8 +637,7 @@ public IEnumerator RotateRight(
             float? degrees = null,
             float speed = 22.5f,
             float acceleration = 22.5f
-        )
-        {
+        ) {
             return RotateAgent(
                 degrees: degrees.GetValueOrDefault(rotateStepDegrees),
                 speed: speed,
@@ -715,8 +649,7 @@ public IEnumerator RotateLeft(
             float? degrees = null,
             float speed = 22.5f,
             float acceleration = 22.5f
-        )
-        {
+        ) {
             return RotateAgent(
                 degrees: -degrees.GetValueOrDefault(rotateStepDegrees),
                 speed: speed,
@@ -728,31 +661,25 @@ public IEnumerator RotateAgent(
             float degrees,
             float speed = 22.5f,
             float acceleration = 22.5f
-        )
-        {
+        ) {
             int direction = 0;
-            if (degrees < 0)
-            {
+            if (degrees < 0) {
                 direction = -1;
             }
-            if (degrees > 0)
-            {
+            if (degrees > 0) {
                 direction = 1;
             }
 
             Debug.Log($"preparing agent {this.transform.name} to rotate");
-            if (Mathf.Approximately(degrees, 0.0f))
-            {
+            if (Mathf.Approximately(degrees, 0.0f)) {
                 Debug.Log("Error! distance to rotate must be nonzero");
-                return new ActionFinished()
-                {
+                return new ActionFinished() {
                     success = false,
                     errorMessage = "Error! distance to rotate must be nonzero"
                 }.GetEnumerator();
             }
 
-            AgentMoveParams amp = new AgentMoveParams
-            {
+            AgentMoveParams amp = new AgentMoveParams {
                 agentState = ABAgentState.Rotating,
                 distance = Mathf.Abs(Mathf.Deg2Rad * degrees),
                 speed = Mathf.Deg2Rad * speed,
@@ -784,8 +711,7 @@ public ActionFinished TeleportArm(
             float? rotation = null,
             bool worldRelative = false,
             bool forceAction = false
-        )
-        {
+        ) {
             GameObject posRotManip = this.GetComponent<BaseAgentComponent>()
                 .StretchArm.GetComponent<Stretch_Robot_Arm_Controller>()
                 .GetArmTarget();
@@ -795,40 +721,31 @@ public ActionFinished TeleportArm(
             float oldLocalRotationAngle = posRotManip.transform.localEulerAngles.y;
 
             // establish defaults in the absence of inputs
-            if (position == null)
-            {
+            if (position == null) {
                 position = new Vector3(0f, 0.1f, 0f);
             }
 
-            if (rotation == null)
-            {
+            if (rotation == null) {
                 rotation = -180f;
             }
 
             // teleport arm!
-            if (!worldRelative)
-            {
+            if (!worldRelative) {
                 posRotManip.transform.localPosition = (Vector3)position;
                 posRotManip.transform.localEulerAngles = new Vector3(0, (float)rotation % 360, 0);
-            }
-            else
-            {
+            } else {
                 posRotManip.transform.position = (Vector3)position;
                 posRotManip.transform.eulerAngles = new Vector3(0, (float)rotation % 360, 0);
             }
 
-            if (SArm.IsArmColliding() && !forceAction)
-            {
+            if (SArm.IsArmColliding() && !forceAction) {
                 posRotManip.transform.localPosition = oldLocalPosition;
                 posRotManip.transform.localEulerAngles = new Vector3(0, oldLocalRotationAngle, 0);
-                return new ActionFinished()
-                {
+                return new ActionFinished() {
                     success = false,
                     errorMessage = "collision detected at desired transform, cannot teleport"
                 };
-            }
-            else
-            {
+            } else {
                 return ActionFinished.Success;
             }
         }
@@ -839,11 +756,9 @@ public override IEnumerator RotateWristRelative(
             float roll = 0f,
             float speed = 400f,
             bool returnToStart = true
-        )
-        {
+        ) {
             // pitch and roll are not supported for the stretch and so we throw an error
-            if (pitch != 0f || roll != 0f)
-            {
+            if (pitch != 0f || roll != 0f) {
                 throw new System.NotImplementedException(
                     "Pitch and roll are not supported for the stretch agent."
                 );
@@ -862,25 +777,21 @@ public override IEnumerator RotateWristRelative(
             );
         }
 
-        private float CalculateTotalMass(Transform rootTransform)
-        {
+        private float CalculateTotalMass(Transform rootTransform) {
             float totalMass = 0f;
             ArticulationBody rootBody = rootTransform.GetComponent<ArticulationBody>();
-            if (rootBody != null)
-            {
+            if (rootBody != null) {
                 totalMass += rootBody.mass;
             }
 
-            foreach (Transform childTransform in rootTransform)
-            {
+            foreach (Transform childTransform in rootTransform) {
                 totalMass += CalculateTotalMass(childTransform);
             }
 
             return totalMass;
         }
 
-        private MovableContinuous getBodyMovable()
-        {
+        private MovableContinuous getBodyMovable() {
             return this.transform.GetComponent<ArticulatedAgentSolver>();
         }
     }
diff --git a/unity/Assets/Scripts/ArticulatedAgentSolver.cs b/unity/Assets/Scripts/ArticulatedAgentSolver.cs
index c14f76a646..325fe151c0 100644
--- a/unity/Assets/Scripts/ArticulatedAgentSolver.cs
+++ b/unity/Assets/Scripts/ArticulatedAgentSolver.cs
@@ -6,15 +6,13 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public enum ABAgentState
-{
+public enum ABAgentState {
     Idle = 0,
     Moving = 1,
     Rotating = 2
 };
 
-public class ABAgentPhysicsParams
-{
+public class ABAgentPhysicsParams {
     public float distance;
     public float speed;
     public float maxTimePassed;
@@ -28,16 +26,14 @@ public class ABAgentPhysicsParams
     public List<double> cachedFixedDeltaTimes;
 }
 
-public class AgentMoveParams : ABAgentPhysicsParams
-{
+public class AgentMoveParams : ABAgentPhysicsParams {
     public ABAgentState agentState;
     public float acceleration;
     public float agentMass;
     public Vector3 initialTransformation;
 }
 
-public class ArticulatedAgentSolver : MonoBehaviour, MovableContinuous
-{
+public class ArticulatedAgentSolver : MonoBehaviour, MovableContinuous {
     //pass in arm move parameters for Action based movement
     public AgentMoveParams currentAgentMoveParams = new AgentMoveParams();
 
@@ -63,8 +59,7 @@ public class ArticulatedAgentSolver : MonoBehaviour, MovableContinuous
     private Transform fingersAB;
     private Vector3 fingersInitialOffset;
 
-    void Start()
-    {
+    void Start() {
         myAB = this.GetComponent<ArticulationBody>();
         currentAgentMoveParams.agentState = ABAgentState.Idle;
 
@@ -75,11 +70,9 @@ void Start()
         fingersInitialOffset = fingersAB.localPosition;
     }
 
-    public void PrepToControlAgentFromAction(AgentMoveParams agentMoveParams)
-    {
+    public void PrepToControlAgentFromAction(AgentMoveParams agentMoveParams) {
         Debug.Log($"preparing {this.transform.name} to move");
-        if (Mathf.Approximately(agentMoveParams.distance, 0.0f))
-        {
+        if (Mathf.Approximately(agentMoveParams.distance, 0.0f)) {
             Debug.Log("Error! distance to move must be nonzero");
             return;
         }
@@ -97,14 +90,11 @@ public void PrepToControlAgentFromAction(AgentMoveParams agentMoveParams)
         currentAgentMoveParams.cachedPositions = new List<double>();
         currentAgentMoveParams.cachedFixedDeltaTimes = new List<double>();
 
-        if (currentAgentMoveParams.agentState == ABAgentState.Moving)
-        {
+        if (currentAgentMoveParams.agentState == ABAgentState.Moving) {
             // snapshot the initial agent position to compare with later during movement
             currentAgentMoveParams.initialTransformation = myAB.transform.position;
             prevStepTransformation = myAB.transform.position;
-        }
-        else if (currentAgentMoveParams.agentState == ABAgentState.Rotating)
-        {
+        } else if (currentAgentMoveParams.agentState == ABAgentState.Rotating) {
             currentAgentMoveParams.initialTransformation = myAB.transform.eulerAngles;
             prevStepTransformation = myAB.transform.eulerAngles;
         }
@@ -116,8 +106,7 @@ public void PrepToControlAgentFromAction(AgentMoveParams agentMoveParams)
             Mathf.Pow(currentAgentMoveParams.speed, 2) / (2 * currentAgentMoveParams.acceleration);
         Debug.Log("accelerationDistance by default equals " + accelerationDistance);
 
-        if (2 * accelerationDistance > currentAgentMoveParams.distance)
-        {
+        if (2 * accelerationDistance > currentAgentMoveParams.distance) {
             accelerationDistance = currentAgentMoveParams.distance / 2;
             Debug.Log("accelerationDistance now equals " + accelerationDistance);
         }
@@ -125,8 +114,7 @@ public void PrepToControlAgentFromAction(AgentMoveParams agentMoveParams)
         beginDeceleration = false;
     }
 
-    public void ContinuousUpdate(float fixedDeltaTime)
-    {
+    public void ContinuousUpdate(float fixedDeltaTime) {
         // Vector3 maxForce = currentAgentMoveParams.maxForce * currentAgentMoveParams.direction * Vector3.forward;
         float remainingDistance = currentAgentMoveParams.distance - distanceTransformedSoFar;
 
@@ -145,14 +133,12 @@ public void ContinuousUpdate(float fixedDeltaTime)
         );
 
         accelerationDistance = 0.0f;
-        if (currentAgentMoveParams.agentState == ABAgentState.Moving)
-        {
+        if (currentAgentMoveParams.agentState == ABAgentState.Moving) {
             float currentSpeed = Mathf.Abs(agentOrientedVelocity.z);
             float forceScaler = 1f / fixedDeltaTime;
 
             // CASE: Accelerate - Apply force calculated from difference between intended distance and actual distance after amount of time that has passed
-            if (distanceTransformedSoFar < accelerationDistance)
-            {
+            if (distanceTransformedSoFar < accelerationDistance) {
                 float desiredDistance =
                     0.5f
                     * currentAgentMoveParams.acceleration
@@ -179,14 +165,11 @@ public void ContinuousUpdate(float fixedDeltaTime)
                 myAB.AddRelativeForce(new Vector3(0, 0, relativeForce));
 
                 // CASE: Decelerate - Apply force calculated from difference between intended velocity and actual velocity at given distance remaining to travel
-            }
-            else if (
-                distanceTransformedSoFar
-                >= currentAgentMoveParams.distance - accelerationDistance
-            )
-            {
-                if (beginDeceleration == false)
-                {
+            } else if (
+                  distanceTransformedSoFar
+                  >= currentAgentMoveParams.distance - accelerationDistance
+              ) {
+                if (beginDeceleration == false) {
                     beginDecelerationSpeed = currentSpeed;
                     beginDeceleration = true;
                 }
@@ -214,9 +197,7 @@ public void ContinuousUpdate(float fixedDeltaTime)
                 myAB.AddRelativeForce(new Vector3(0, 0, relativeForce));
 
                 // CASE: Cruise Control - Apply force calculated from difference between intended velocity and current velocity
-            }
-            else
-            {
+            } else {
                 float speedDelta = currentAgentMoveParams.speed - currentSpeed;
 
                 float relativeForce =
@@ -259,9 +240,7 @@ public void ContinuousUpdate(float fixedDeltaTime)
             // Store current values for comparing with next FixedUpdate
             prevStepTransformation = currentPosition;
             prevStepForward = myAB.transform.forward;
-        }
-        else if (currentAgentMoveParams.agentState == ABAgentState.Rotating)
-        {
+        } else if (currentAgentMoveParams.agentState == ABAgentState.Rotating) {
             // When rotating the agent shouldn't be moving forward/backwards but its wheels are moving so we use a smaller
             // damping force to counteract forward/backward movement (as opposed to the force used for lateral movement
             // above)
@@ -279,8 +258,7 @@ public void ContinuousUpdate(float fixedDeltaTime)
             float forceScaler = 1f / fixedDeltaTime;
 
             // CASE: Accelerate - Apply force calculated from difference between intended distance and actual distance after amount of time that has passed
-            if (distanceTransformedSoFar < accelerationDistance)
-            {
+            if (distanceTransformedSoFar < accelerationDistance) {
                 float desiredAngularDistance =
                     0.5f
                     * currentAgentMoveParams.acceleration
@@ -303,14 +281,11 @@ public void ContinuousUpdate(float fixedDeltaTime)
                 myAB.AddRelativeTorque(new Vector3(0, relativeTorque, 0));
 
                 // CASE: Decelerate - Apply force calculated from difference between intended angular velocity and actual angular velocity at given angular distance remaining to travel
-            }
-            else if (
-                distanceTransformedSoFar
-                >= currentAgentMoveParams.distance - accelerationDistance
-            )
-            {
-                if (beginDeceleration == false)
-                {
+            } else if (
+                  distanceTransformedSoFar
+                  >= currentAgentMoveParams.distance - accelerationDistance
+              ) {
+                if (beginDeceleration == false) {
                     beginDecelerationSpeed = currentAngularSpeed;
                     beginDeceleration = true;
                 }
@@ -335,9 +310,7 @@ public void ContinuousUpdate(float fixedDeltaTime)
                 myAB.AddRelativeTorque(new Vector3(0, relativeTorque, 0));
 
                 // CASE: Cruise - Apply force calculated from difference between intended angular velocity and current angular velocity
-            }
-            else
-            {
+            } else {
                 float angularSpeedDelta = currentAgentMoveParams.speed - currentAngularSpeed;
 
                 float relativeTorque = Mathf.Clamp(
@@ -373,13 +346,9 @@ public void ContinuousUpdate(float fixedDeltaTime)
 
             // Store current values for comparing with next FixedUpdate
             prevStepTransformation = currentRotation;
-        }
-        else if (currentAgentMoveParams.agentState == ABAgentState.Idle)
-        {
+        } else if (currentAgentMoveParams.agentState == ABAgentState.Idle) {
             // Do nothing
-        }
-        else
-        {
+        } else {
             throw new System.NotImplementedException(
                 $"Agent is not in a valid movement state: {currentAgentMoveParams.agentState}."
             );
@@ -397,8 +366,7 @@ public void ContinuousUpdate(float fixedDeltaTime)
         return;
     }
 
-    public bool ShouldHalt()
-    {
+    public bool ShouldHalt() {
         // Debug.Log("checking ArticulatedAgentController shouldHalt");
         bool shouldStop = false;
         ArticulatedAgentSolver a = this;
@@ -415,15 +383,12 @@ public bool ShouldHalt()
                 minMovementPerSecond: a.currentAgentMoveParams.minMovementPerSecond,
                 haltCheckTimeWindow: a.currentAgentMoveParams.haltCheckTimeWindow
             )
-        )
-        {
+        ) {
             // if any single joint is still not halting, return false
             // Debug.Log("still not done, don't halt yet");
             shouldStop = false;
             return shouldStop;
-        }
-        else
-        {
+        } else {
             //this joint returns that it should stop!
             Debug.Log($"halted! Return shouldStop! Distance moved: {a.distanceTransformedSoFar}");
             shouldStop = true;
@@ -432,13 +397,11 @@ public bool ShouldHalt()
     }
 
     // TODO remove from API
-    public virtual string GetHaltMessage()
-    {
+    public virtual string GetHaltMessage() {
         return "";
     }
 
-    public ActionFinished FinishContinuousMove(BaseFPSAgentController controller)
-    {
+    public ActionFinished FinishContinuousMove(BaseFPSAgentController controller) {
         Debug.Log("starting continuousMoveFinishAB");
         controller.transform.GetComponent<ArticulationBody>().velocity = Vector3.zero;
         controller.transform.GetComponent<ArticulationBody>().angularVelocity = Vector3.zero;
@@ -452,8 +415,7 @@ public ActionFinished FinishContinuousMove(BaseFPSAgentController controller)
         //controller.SetFloorColliderToSlippery();
 
         bool actionSuccess = IsFingerTransformCorrect();
-        if (!actionSuccess)
-        {
+        if (!actionSuccess) {
             controller.agentManager.SetCriticalErrorState();
         }
 
@@ -473,8 +435,7 @@ public bool shouldHalt(
         List<double> cachedFixedTimeDeltas,
         double minMovementPerSecond,
         double haltCheckTimeWindow
-    )
-    {
+    ) {
         bool shouldHalt = false;
 
         //halt if positions/rotations are within tolerance and effectively not changing
@@ -487,24 +448,21 @@ double haltCheckTimeWindow
                 minMovementPerSecond: minMovementPerSecond,
                 haltCheckTimeWindow: haltCheckTimeWindow
             )
-        )
-        {
+        ) {
             shouldHalt = true;
             // IdleAllStates();
             Debug.Log("halt due to position delta within tolerance");
             return shouldHalt;
         }
         //check if the amount moved/rotated exceeds this agents target
-        else if (distanceTransformedSoFar >= currentAgentMoveParams.distance)
-        {
+        else if (distanceTransformedSoFar >= currentAgentMoveParams.distance) {
             shouldHalt = true;
             // IdleAllStates();
             Debug.Log("halt due to distance reached/exceeded");
             return shouldHalt;
         }
         //hard check for time limit
-        else if (currentAgentMoveParams.timePassed >= currentAgentMoveParams.maxTimePassed)
-        {
+        else if (currentAgentMoveParams.timePassed >= currentAgentMoveParams.maxTimePassed) {
             shouldHalt = true;
             // IdleAllStates();
             Debug.Log("halt from timeout");
@@ -520,22 +478,18 @@ public static bool ApproximatelyNoChange(
         List<double> timeDeltas,
         double minMovementPerSecond,
         double haltCheckTimeWindow
-    )
-    {
+    ) {
         double totalTime = 0f;
         double totalDistanceTraveled = 0f;
-        for (int i = positionDeltas.Count - 1; i >= 0; i--)
-        {
+        for (int i = positionDeltas.Count - 1; i >= 0; i--) {
             totalTime += timeDeltas[i];
             totalDistanceTraveled += Mathf.Abs((float)positionDeltas[i]);
-            if (totalTime >= haltCheckTimeWindow)
-            {
+            if (totalTime >= haltCheckTimeWindow) {
                 break;
             }
         }
 
-        if (totalTime < haltCheckTimeWindow)
-        {
+        if (totalTime < haltCheckTimeWindow) {
             // Not enough time recorded to make a decision
             return false;
         }
@@ -543,11 +497,9 @@ double haltCheckTimeWindow
         return totalDistanceTraveled / totalTime < minMovementPerSecond;
     }
 
-    void SetCenterOfMass(Vector3 worldCenterOfMass)
-    {
+    void SetCenterOfMass(Vector3 worldCenterOfMass) {
         ArticulationBody[] bodies = FindObjectsOfType<ArticulationBody>();
-        foreach (ArticulationBody body in bodies)
-        {
+        foreach (ArticulationBody body in bodies) {
             // Convert world-space center of mass to local space
             Vector3 localCenterOfMass = body.transform.InverseTransformPoint(worldCenterOfMass);
             body.centerOfMass = localCenterOfMass;
@@ -555,8 +507,7 @@ void SetCenterOfMass(Vector3 worldCenterOfMass)
         }
     }
 
-    private bool IsFingerTransformCorrect()
-    {
+    private bool IsFingerTransformCorrect() {
         var eps = 0.1;
         var diff = fingersAB.localPosition - fingersInitialOffset;
         return diff.magnitude <= eps;
diff --git a/unity/Assets/Scripts/ArticulatedArmController.cs b/unity/Assets/Scripts/ArticulatedArmController.cs
index a760935460..cba4dbc10f 100644
--- a/unity/Assets/Scripts/ArticulatedArmController.cs
+++ b/unity/Assets/Scripts/ArticulatedArmController.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public partial class ArticulatedArmController : ArmController
-{
+public partial class ArticulatedArmController : ArmController {
     public ArticulatedArmJointSolver[] joints;
 
     [SerializeField]
@@ -28,58 +27,48 @@ public partial class ArticulatedArmController : ArmController
     public new List<SimObjPhysics> heldObjects;
 
     // TODO: Possibly reimplement this fucntions, if AB read of transform is ok then may not need to reimplement
-    public override Transform pickupParent()
-    {
+    public override Transform pickupParent() {
         return magnetSphere.transform;
     }
 
-    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset) {
         return handCameraTransform.TransformPoint(offset)
             - handCameraTransform.position
             + WristToManipulator;
     }
 
-    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset) {
         return this.transform.TransformPoint(offset) - this.transform.position;
     }
 
-    public override Vector3 pointToWristSpace(Vector3 point)
-    {
+    public override Vector3 pointToWristSpace(Vector3 point) {
         return handCameraTransform.TransformPoint(point) + WristToManipulator;
     }
 
-    public override Vector3 pointToArmBaseSpace(Vector3 point)
-    {
+    public override Vector3 pointToArmBaseSpace(Vector3 point) {
         return armBase.transform.TransformPoint(point);
     }
 
-    public override void ContinuousUpdate(float fixedDeltaTime)
-    {
+    public override void ContinuousUpdate(float fixedDeltaTime) {
         //so assume each joint that needs to move has had its `currentArmMoveParams` set
         //now we call `ControlJointFromAction` on all joints each physics update to get it to move...
         //Debug.Log("starting ArticulatedArmController.manipulateArm");
-        foreach (ArticulatedArmJointSolver j in joints)
-        {
+        foreach (ArticulatedArmJointSolver j in joints) {
             j.ControlJointFromAction(fixedDeltaTime);
         }
     }
 
-    public override bool ShouldHalt()
-    {
+    public override bool ShouldHalt() {
         //Debug.Log("checking ArticulatedArmController shouldHalt");
         bool shouldHalt = false;
-        foreach (ArticulatedArmJointSolver j in joints)
-        {
+        foreach (ArticulatedArmJointSolver j in joints) {
             //only halt if all joints report back that shouldHalt = true
             //joints that are idle and not moving will return shouldHalt = true by default
             //Debug.Log($"checking joint: {j.transform.name}");
             //Debug.Log($"distance moved so far for this joint is: {j.distanceTransformedSoFar}");
 
             //check all joints that have had movement params set to see if they have halted or not
-            if (j.currentArmMoveParams != null)
-            {
+            if (j.currentArmMoveParams != null) {
                 if (
                     !j.shouldHalt(
                         distanceTransformedSoFar: j.distanceTransformedSoFar,
@@ -88,16 +77,14 @@ public override bool ShouldHalt()
                         minMovementPerSecond: j.currentArmMoveParams.minMovementPerSecond,
                         haltCheckTimeWindow: j.currentArmMoveParams.haltCheckTimeWindow
                     )
-                )
-                {
+                ) {
                     //if any single joint is still not halting, return false
                     //Debug.Log("still not done, don't halt yet");
                     shouldHalt = false;
                     return shouldHalt;
                 }
                 //this joint returns that it should stop! Now we must wait to see if there rest
-                else
-                {
+                else {
                     //Debug.Log($"halted! Distance moved: {j.distanceTransformedSoFar}");
                     shouldHalt = true;
                     continue;
@@ -109,16 +96,14 @@ public override bool ShouldHalt()
         return shouldHalt;
     }
 
-    public override ActionFinished FinishContinuousMove(BaseFPSAgentController controller)
-    {
+    public override ActionFinished FinishContinuousMove(BaseFPSAgentController controller) {
         Debug.Log("starting continuousMoveFinishAB");
         string debugMessage = "I guess everything is fine?";
 
         // TODO inherit both solvers from common code
         // bool actionSuccess = IsFingerTransformCorrect();
         bool actionSuccess = true;
-        if (!actionSuccess)
-        {
+        if (!actionSuccess) {
             controller.agentManager.SetCriticalErrorState();
         }
 
@@ -130,13 +115,11 @@ public override ActionFinished FinishContinuousMove(BaseFPSAgentController contr
         return new ActionFinished { success = actionSuccess, errorMessage = debugMessage };
     }
 
-    public override GameObject GetArmTarget()
-    {
+    public override GameObject GetArmTarget() {
         return armTarget.gameObject;
     }
 
-    void Start()
-    {
+    void Start() {
         wristPlaceholderForwardOffset = wristPlaceholderTransform.transform.localPosition.z;
         agentCapsuleCollider = PhysicsController.GetComponent<CapsuleCollider>();
         //Debug.Log($"wrist offset is: {wristPlaceholderForwardOffset}");
@@ -159,8 +142,7 @@ public override IEnumerator moveArmRelative(
         bool returnToStart,
         string coordinateSpace,
         bool restrictTargetPosition
-    )
-    {
+    ) {
         yield return new ActionFinished() { success = false, errorMessage = "Not implemented" };
         //not doing this one yet soooo uhhhhh ignore for now
     }
@@ -171,8 +153,7 @@ public IEnumerator moveArmTarget(
         float unitsPerSecond,
         float fixedDeltaTime,
         bool useLimits = false
-    )
-    {
+    ) {
         float minMovementPerSecond = 1e-3f;
         float maxTimePassed = 10.0f;
         float haltCheckTimeWindow = 0.2f;
@@ -187,20 +168,17 @@ public IEnumerator moveArmTarget(
         int direction = 0;
 
         //this is sort of a wonky way to detect direction but it'll work for noooooow
-        if (target.z < 0)
-        {
+        if (target.z < 0) {
             direction = -1;
         }
-        if (target.z > 0)
-        {
+        if (target.z > 0) {
             direction = 1;
         }
 
         Dictionary<ArticulatedArmJointSolver, float> jointToArmDistanceRatios =
             new Dictionary<ArticulatedArmJointSolver, float>();
 
-        ArmMoveParams amp = new ArmMoveParams
-        {
+        ArmMoveParams amp = new ArmMoveParams {
             distance = distance,
             speed = unitsPerSecond,
             minMovementPerSecond = minMovementPerSecond,
@@ -226,18 +204,15 @@ public IEnumerator moveArmTarget(
     public float GetDriveUpperLimit(
         ArticulatedArmJointSolver joint,
         JointAxisType jointAxisType = JointAxisType.Extend
-    )
-    {
+    ) {
         float upperLimit = 0.0f;
 
-        if (jointAxisType == JointAxisType.Extend)
-        {
+        if (jointAxisType == JointAxisType.Extend) {
             //z drive
             upperLimit = joint.myAB.zDrive.upperLimit;
         }
 
-        if (jointAxisType == JointAxisType.Lift)
-        {
+        if (jointAxisType == JointAxisType.Lift) {
             //y drive
             upperLimit = joint.myAB.yDrive.upperLimit;
         }
@@ -255,25 +230,21 @@ public IEnumerator moveArmBase(
         bool returnToStartPositionIfFailed,
         bool normalizedY,
         bool useLimits
-    )
-    {
+    ) {
         Debug.Log("starting moveArmBase in ArticulatedArmController");
         float minMovementPerSecond = 1e-3f;
         float maxTimePassed = 10.0f;
         float haltCheckTimeWindow = 0.2f;
 
         int direction = 0;
-        if (distance < 0)
-        {
+        if (distance < 0) {
             direction = -1;
         }
-        if (distance > 0)
-        {
+        if (distance > 0) {
             direction = 1;
         }
 
-        ArmMoveParams amp = new ArmMoveParams
-        {
+        ArmMoveParams amp = new ArmMoveParams {
             distance = Mathf.Abs(distance),
             speed = unitsPerSecond,
             minMovementPerSecond = minMovementPerSecond,
@@ -308,8 +279,7 @@ public IEnumerator moveArmBaseUp(
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed,
         bool useLimits
-    )
-    {
+    ) {
         return moveArmBase(
             controller: controller,
             distance: distance,
@@ -324,8 +294,7 @@ bool useLimits
     private void prepAllTheThingsBeforeJointMoves(
         ArticulatedArmJointSolver joint,
         ArmMoveParams armMoveParams
-    )
-    {
+    ) {
         //FloorCollider.material = sticky;
         joint.PrepToControlJointFromAction(armMoveParams);
     }
@@ -336,25 +305,21 @@ public IEnumerator rotateWrist(
         float degreesPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed
-    )
-    {
+    ) {
         Debug.Log("starting rotateWrist in ArticulatedArmController");
         float minMovementPerSecond = 1f * Mathf.Deg2Rad;
         float maxTimePassed = 10.0f;
         float haltCheckTimeWindow = 0.2f;
 
         int direction = 0;
-        if (distance < 0)
-        {
+        if (distance < 0) {
             direction = -1;
         }
-        if (distance > 0)
-        {
+        if (distance > 0) {
             direction = 1;
         }
 
-        ArmMoveParams amp = new ArmMoveParams
-        {
+        ArmMoveParams amp = new ArmMoveParams {
             distance = Mathf.Abs(distance),
             speed = degreesPerSecond,
             minMovementPerSecond = minMovementPerSecond,
@@ -378,19 +343,15 @@ bool returnToStartPositionIfFailed
         );
     }
 
-    public IEnumerable PickupObject(List<string> objectIds)
-    {
+    public IEnumerable PickupObject(List<string> objectIds) {
         Debug.Log("calling PickupObject from ArticulatedArmController");
         bool pickedUp = false;
 
-        foreach (SimObjPhysics sop in WhatObjectsAreInsideMagnetSphereAsSOP(onlyPickupable: true))
-        {
+        foreach (SimObjPhysics sop in WhatObjectsAreInsideMagnetSphereAsSOP(onlyPickupable: true)) {
             Debug.Log($"sop named: {sop.objectID} found inside sphere");
-            if (objectIds != null)
-            {
+            if (objectIds != null) {
                 //only grab objects specified by objectIds
-                if (!objectIds.Contains(sop.objectID))
-                {
+                if (!objectIds.Contains(sop.objectID)) {
                     continue;
                 }
             }
@@ -413,8 +374,7 @@ public IEnumerable PickupObject(List<string> objectIds)
             heldObjects.Add(sop);
         }
         var errorMessage = "";
-        if (!pickedUp)
-        {
+        if (!pickedUp) {
             errorMessage = (
                 objectIds != null
                     ? "No objects (specified by objectId) were valid to be picked up by the arm"
@@ -426,10 +386,8 @@ public IEnumerable PickupObject(List<string> objectIds)
     }
 
     //called by ArmAgentController ReleaseObject
-    public override IEnumerator DropObject()
-    {
-        foreach (SimObjPhysics sop in heldObjects)
-        {
+    public override IEnumerator DropObject() {
+        foreach (SimObjPhysics sop in heldObjects) {
             //remove the joint component
             //may need a null check for if we decide to break joints via force at some poine.
             //look into the OnJointBreak callback if needed
@@ -442,28 +400,23 @@ public override IEnumerator DropObject()
         yield return ActionFinished.Success;
     }
 
-    protected override void lastStepCallback()
-    {
-        foreach (ArticulatedArmJointSolver joint in joints)
-        {
+    protected override void lastStepCallback() {
+        foreach (ArticulatedArmJointSolver joint in joints) {
             ArticulationBody myAB = joint.myAB;
 
-            if (myAB == null)
-            {
+            if (myAB == null) {
                 Debug.LogWarning("Articulated body is null, skipping.");
                 continue;
             }
 
             // Check the joint type and get the current joint position and velocity
-            if (myAB.jointType == ArticulationJointType.PrismaticJoint)
-            {
+            if (myAB.jointType == ArticulationJointType.PrismaticJoint) {
                 //                Debug.Log($"joint {joint.gameObject}");
                 //                Debug.Log($"joint {myAB.jointType}");
                 //                Debug.Log($"solverIterations {myAB.solverIterations}");
                 //                Debug.Log($"solverVelocityIterations {myAB.solverVelocityIterations}");
 
-                if (myAB.dofCount != 1)
-                {
+                if (myAB.dofCount != 1) {
                     throw new NotImplementedException(
                         "Prismatic joint must have 1 degree of freedom"
                     );
@@ -477,13 +430,11 @@ protected override void lastStepCallback()
                 // Super hacky way to get which drive is active
                 string whichDrive = "x";
                 ArticulationDrive activeDrive = xDrive;
-                if (yDrive.target != 0.0f)
-                {
+                if (yDrive.target != 0.0f) {
                     activeDrive = yDrive;
                     whichDrive = "y";
                 }
-                if (zDrive.target != 0.0f)
-                {
+                if (zDrive.target != 0.0f) {
                     activeDrive = zDrive;
                     whichDrive = "z";
                 }
@@ -494,24 +445,18 @@ protected override void lastStepCallback()
                 activeDrive.target = currentPosition;
                 activeDrive.targetVelocity = 0f;
 
-                if (whichDrive == "x")
-                {
+                if (whichDrive == "x") {
                     myAB.xDrive = activeDrive;
                 }
-                if (whichDrive == "y")
-                {
+                if (whichDrive == "y") {
                     myAB.yDrive = activeDrive;
                 }
-                if (whichDrive == "z")
-                {
+                if (whichDrive == "z") {
                     myAB.zDrive = activeDrive;
                 }
-            }
-            else if (myAB.jointType == ArticulationJointType.RevoluteJoint)
-            {
+            } else if (myAB.jointType == ArticulationJointType.RevoluteJoint) {
                 // For revolute joints
-                if (myAB.dofCount != 1)
-                {
+                if (myAB.dofCount != 1) {
                     throw new NotImplementedException(
                         "Revolute joint must have 1 degree of freedom"
                     );
@@ -526,25 +471,21 @@ protected override void lastStepCallback()
                 xDrive.targetVelocity = 0f;
 
                 myAB.xDrive = xDrive;
-            }
-            else
-            {
+            } else {
                 throw new NotImplementedException($"Unsupported joint type {myAB.jointType}");
             }
         }
     }
 
     //ignore this, we need new metadata that makes more sense for the articulation heirarchy soooooo
-    public override ArmMetadata GenerateMetadata()
-    {
+    public override ArmMetadata GenerateMetadata() {
         // TODO: Reimplement, low prio for benchmark
         ArmMetadata meta = new ArmMetadata();
         return meta;
     }
 
     //actual metadata implementation for articulation heirarchy
-    public ArticulationArmMetadata GenerateArticulationMetadata()
-    {
+    public ArticulationArmMetadata GenerateArticulationMetadata() {
         ArticulationArmMetadata meta = new ArticulationArmMetadata();
 
         List<ArticulationJointMetadata> metaJoints = new List<ArticulationJointMetadata>();
@@ -554,8 +495,7 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
         float angleRot;
         Vector3 vectorRot;
 
-        for (int i = 0; i < joints.Count(); i++)
-        {
+        for (int i = 0; i < joints.Count(); i++) {
             ArticulationJointMetadata jMeta = new ArticulationJointMetadata();
 
             jMeta.name = joints[i].name;
@@ -571,13 +511,10 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
             currentRotation = joints[i].transform.rotation;
 
             // Check that world-relative rotation is angle-axis-notation-compatible
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                 jMeta.rotation = new Vector4(vectorRot.x, vectorRot.y, vectorRot.z, angleRot);
-            }
-            else
-            {
+            } else {
                 jMeta.rotation = new Vector4(1, 0, 0, 0);
             }
 
@@ -585,8 +522,7 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
             // Grab rotation of current joint's angler relative to root joint
             currentRotation =
                 Quaternion.Inverse(joints[0].transform.rotation) * joints[i].transform.rotation;
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                 jMeta.rootRelativeRotation = new Vector4(
                     vectorRot.x,
@@ -594,24 +530,20 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
                     vectorRot.z,
                     angleRot
                 );
-            }
-            else
-            {
+            } else {
                 jMeta.rootRelativeRotation = new Vector4(1, 0, 0, 0);
             }
 
             // LOCAL POSITION AND LOCAL ROTATION
             //get local position and local rotation relative to immediate parent in heirarchy
-            if (i != 0)
-            {
+            if (i != 0) {
                 jMeta.localPosition = joints[i - 1]
                     .transform.InverseTransformPoint(joints[i].transform.position);
 
                 var currentLocalRotation =
                     Quaternion.Inverse(joints[i - 1].transform.rotation)
                     * joints[i].transform.rotation;
-                if (currentLocalRotation != new Quaternion(0, 0, 0, -1))
-                {
+                if (currentLocalRotation != new Quaternion(0, 0, 0, -1)) {
                     currentLocalRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                     jMeta.localRotation = new Vector4(
                         vectorRot.x,
@@ -619,14 +551,10 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
                         vectorRot.z,
                         angleRot
                     );
-                }
-                else
-                {
+                } else {
                     jMeta.localRotation = new Vector4(1, 0, 0, 0);
                 }
-            }
-            else
-            {
+            } else {
                 //special case for the lift since its the base of the arm
                 jMeta.localPosition = jMeta.position;
                 jMeta.localRotation = jMeta.rootRelativeRotation;
@@ -641,10 +569,8 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
         // note this is different from objects intersecting the hand's sphere,
         // there could be a case where an object is inside the sphere but not picked up by the hand
         List<string> heldObjectIDs = new List<string>();
-        if (heldObjects != null)
-        {
-            foreach (SimObjPhysics sop in heldObjects)
-            {
+        if (heldObjects != null) {
+            foreach (SimObjPhysics sop in heldObjects) {
                 heldObjectIDs.Add(sop.objectID);
             }
         }
@@ -663,8 +589,7 @@ public ArticulationArmMetadata GenerateArticulationMetadata()
     }
 
 #if UNITY_EDITOR
-    public class GizmoDrawCapsule
-    {
+    public class GizmoDrawCapsule {
         public Vector3 p0;
         public Vector3 p1;
         public float radius;
@@ -672,12 +597,9 @@ public class GizmoDrawCapsule
 
     List<GizmoDrawCapsule> debugCapsules = new List<GizmoDrawCapsule>();
 
-    private void OnDrawGizmos()
-    {
-        if (debugCapsules.Count > 0)
-        {
-            foreach (GizmoDrawCapsule thing in debugCapsules)
-            {
+    private void OnDrawGizmos() {
+        if (debugCapsules.Count > 0) {
+            foreach (GizmoDrawCapsule thing in debugCapsules) {
                 Gizmos.DrawWireSphere(thing.p0, thing.radius);
                 Gizmos.DrawWireSphere(thing.p1, thing.radius);
             }
diff --git a/unity/Assets/Scripts/ArticulatedArmExtender.cs b/unity/Assets/Scripts/ArticulatedArmExtender.cs
index a6e95ebe09..12d0607d41 100644
--- a/unity/Assets/Scripts/ArticulatedArmExtender.cs
+++ b/unity/Assets/Scripts/ArticulatedArmExtender.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 // Handles collider stretching and arm extension animation
-public class ArticulatedArmExtender : MonoBehaviour
-{
+public class ArticulatedArmExtender : MonoBehaviour {
     public Transform arm2,
         arm3,
         arm4;
@@ -16,19 +15,16 @@ public class ArticulatedArmExtender : MonoBehaviour
 
     public float scaleMultiplier = 1f;
 
-    public void Start()
-    {
+    public void Start() {
         initialZPos = this.gameObject.transform.localPosition.z;
         arm2InitialZPos = arm2.gameObject.transform.localPosition.z;
         arm3InitialZPos = arm3.gameObject.transform.localPosition.z;
         arm4InitialZPos = arm4.gameObject.transform.localPosition.z;
     }
 
-    private void scaleColliders()
-    {
+    private void scaleColliders() {
         var currentZPos = this.gameObject.transform.localPosition.z;
-        foreach (Transform go in myColliders)
-        {
+        foreach (Transform go in myColliders) {
             go.localScale = new Vector3(
                 go.localScale.x,
                 go.localScale.y,
@@ -37,8 +33,7 @@ private void scaleColliders()
         }
     }
 
-    private void animate(float currentZPos)
-    {
+    private void animate(float currentZPos) {
         //Extend each part of arm by one-quarter of extension length, in local z-direction, also adds offset from origin of arm_1 to each arm position
         float armExtensionLength = currentZPos - initialZPos;
         arm2.localPosition = new Vector3(0, 0, 1 * (armExtensionLength / 4) + arm2InitialZPos); //+ 0.01300028f);
@@ -48,13 +43,11 @@ private void animate(float currentZPos)
     }
 
     //should this be in fixed update????
-    public void FixedUpdate()
-    {
+    public void FixedUpdate() {
         Extend();
     }
 
-    public void Extend()
-    {
+    public void Extend() {
         scaleColliders();
         var currentZPos = this.gameObject.transform.localPosition.z;
         animate(currentZPos);
diff --git a/unity/Assets/Scripts/ArticulatedArmJointSolver.cs b/unity/Assets/Scripts/ArticulatedArmJointSolver.cs
index e3a5ab4200..e3b21e10ec 100644
--- a/unity/Assets/Scripts/ArticulatedArmJointSolver.cs
+++ b/unity/Assets/Scripts/ArticulatedArmJointSolver.cs
@@ -4,45 +4,39 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public enum ArmLiftState
-{
+public enum ArmLiftState {
     Idle = 0,
     MovingDown = -1,
     MovingUp = 1
 };
 
-public enum ArmExtendState
-{
+public enum ArmExtendState {
     Idle = 0,
     MovingBackward = -1,
     MovingForward = 1
 };
 
-public enum ArmRotateState
-{
+public enum ArmRotateState {
     Idle = 0,
     Negative = -1,
     Positive = 1
 };
 
-public enum JointAxisType
-{
+public enum JointAxisType {
     Unassigned,
     Extend,
     Lift,
     Rotate
 };
 
-public class ArmMoveParams : ABAgentPhysicsParams
-{
+public class ArmMoveParams : ABAgentPhysicsParams {
     public ArticulatedAgentController controller;
     public bool useLimits;
     public ArticulatedArmExtender armExtender;
     public float initialJointPosition;
 }
 
-public class ArticulatedArmJointSolver : MonoBehaviour
-{
+public class ArticulatedArmJointSolver : MonoBehaviour {
     [Header("What kind of joint is this?")]
     public JointAxisType jointAxisType = JointAxisType.Unassigned;
 
@@ -71,16 +65,13 @@ public class ArticulatedArmJointSolver : MonoBehaviour
     public float lowerArmExtendLimit = 0.0f;
     public float upperArmExtendLimit = 0.516f;
 
-    void Start()
-    {
+    void Start() {
         myAB = this.GetComponent<ArticulationBody>();
     }
 
-    public void PrepToControlJointFromAction(ArmMoveParams armMoveParams)
-    {
+    public void PrepToControlJointFromAction(ArmMoveParams armMoveParams) {
         Debug.Log($"preparing joint {this.transform.name} to move");
-        if (Mathf.Approximately(armMoveParams.distance, 0.0f))
-        {
+        if (Mathf.Approximately(armMoveParams.distance, 0.0f)) {
             Debug.Log("Error! distance to move must be nonzero");
             return;
         }
@@ -100,65 +91,47 @@ public void PrepToControlJointFromAction(ArmMoveParams armMoveParams)
         prevStepTransformation = myAB.jointPosition[0];
 
         //we are a lift type joint, moving along the local y axis
-        if (jointAxisType == JointAxisType.Lift)
-        {
-            if (liftState == ArmLiftState.Idle)
-            {
+        if (jointAxisType == JointAxisType.Lift) {
+            if (liftState == ArmLiftState.Idle) {
                 //set if we are moving up or down based on sign of distance from input
-                if (armMoveParams.direction < 0)
-                {
+                if (armMoveParams.direction < 0) {
                     Debug.Log("setting lift state to move down");
                     liftState = ArmLiftState.MovingDown;
-                }
-                else if (armMoveParams.direction > 0)
-                {
+                } else if (armMoveParams.direction > 0) {
                     Debug.Log("setting lift state to move up");
                     liftState = ArmLiftState.MovingUp;
                 }
             }
         }
         //we are an extending joint, moving along the local z axis
-        else if (jointAxisType == JointAxisType.Extend)
-        {
-            if (extendState == ArmExtendState.Idle)
-            {
+        else if (jointAxisType == JointAxisType.Extend) {
+            if (extendState == ArmExtendState.Idle) {
                 currentArmMoveParams.armExtender = this.GetComponent<ArticulatedArmExtender>();
                 //currentArmMoveParams.armExtender.Init();
 
                 //set if we are extending or retracting
-                if (armMoveParams.direction < 0)
-                {
+                if (armMoveParams.direction < 0) {
                     extendState = ArmExtendState.MovingBackward;
-                }
-                else if (armMoveParams.direction > 0)
-                {
+                } else if (armMoveParams.direction > 0) {
                     extendState = ArmExtendState.MovingForward;
                 }
             }
 
             //we are a rotating joint, rotating around the local y axis
-        }
-        else if (jointAxisType == JointAxisType.Rotate)
-        {
-            if (rotateState == ArmRotateState.Idle)
-            {
+        } else if (jointAxisType == JointAxisType.Rotate) {
+            if (rotateState == ArmRotateState.Idle) {
                 //set if we are rotating left or right
-                if (armMoveParams.direction < 0)
-                {
+                if (armMoveParams.direction < 0) {
                     rotateState = ArmRotateState.Negative;
-                }
-                else if (armMoveParams.direction > 0)
-                {
+                } else if (armMoveParams.direction > 0) {
                     rotateState = ArmRotateState.Positive;
                 }
             }
         }
     }
 
-    public void ControlJointFromAction(float fixedDeltaTime)
-    {
-        if (currentArmMoveParams == null)
-        {
+    public void ControlJointFromAction(float fixedDeltaTime) {
+        if (currentArmMoveParams == null) {
             return;
         }
 
@@ -166,11 +139,9 @@ public void ControlJointFromAction(float fixedDeltaTime)
 
         // Debug.Log($"Type: {jointAxisType.ToString()} pos");
         //we are a lift type joint
-        if (jointAxisType == JointAxisType.Lift)
-        {
+        if (jointAxisType == JointAxisType.Lift) {
             //if instead we are moving up or down actively
-            if (liftState != ArmLiftState.Idle)
-            {
+            if (liftState != ArmLiftState.Idle) {
                 //Debug.Log("start ControlJointFromAction for axis type LIFT");
                 var drive = myAB.yDrive;
                 float currentPosition = myAB.jointPosition[0];
@@ -193,8 +164,7 @@ public void ControlJointFromAction(float fixedDeltaTime)
                 // Store current values for comparing with next FixedUpdate
                 prevStepTransformation = currentPosition;
 
-                if (currentArmMoveParams.useLimits)
-                {
+                if (currentArmMoveParams.useLimits) {
                     Debug.Log("extending/retracting arm with limits");
                     float distanceRemaining =
                         currentArmMoveParams.distance - distanceTransformedSoFar;
@@ -208,16 +178,13 @@ public void ControlJointFromAction(float fixedDeltaTime)
                     targetPosition = currentPosition + direction * distanceRemaining;
 
                     float offset = 1e-2f;
-                    if (liftState == ArmLiftState.MovingUp)
-                    {
+                    if (liftState == ArmLiftState.MovingUp) {
                         drive.upperLimit = Mathf.Min(upperArmBaseLimit, targetPosition + offset);
                         drive.lowerLimit = Mathf.Min(
                             Mathf.Max(lowerArmBaseLimit, currentPosition),
                             targetPosition
                         );
-                    }
-                    else if (liftState == ArmLiftState.MovingDown)
-                    {
+                    } else if (liftState == ArmLiftState.MovingDown) {
                         drive.lowerLimit = Mathf.Max(lowerArmBaseLimit, targetPosition);
                         drive.upperLimit = Mathf.Max(
                             Mathf.Min(upperArmBaseLimit, currentPosition + offset),
@@ -249,13 +216,10 @@ public void ControlJointFromAction(float fixedDeltaTime)
 
                     drive.target = targetPosition;
 
-                    if (willReachTargetSoon)
-                    {
+                    if (willReachTargetSoon) {
                         drive.stiffness = 10000f;
                         drive.targetVelocity = -direction * (distanceRemaining / slowDownTime);
-                    }
-                    else
-                    {
+                    } else {
                         drive.stiffness = 0f;
                         drive.targetVelocity = -direction * currentArmMoveParams.speed;
                     }
@@ -282,10 +246,8 @@ public void ControlJointFromAction(float fixedDeltaTime)
         //for extending arm joints, assume all extending joints will be in some state of movement based on input distance
         //the shouldHalt function in ArticulatedAgentController will wait for all individual extending joints to go back to
         //idle before actionFinished is called
-        else if (jointAxisType == JointAxisType.Extend)
-        {
-            if (extendState != ArmExtendState.Idle)
-            {
+        else if (jointAxisType == JointAxisType.Extend) {
+            if (extendState != ArmExtendState.Idle) {
                 //Debug.Log("start ControlJointFromAction for axis type EXTEND");
                 var drive = myAB.zDrive;
                 float currentPosition = myAB.jointPosition[0];
@@ -302,8 +264,7 @@ public void ControlJointFromAction(float fixedDeltaTime)
                 // Store current values for comparing with next FixedUpdate
                 prevStepTransformation = currentPosition;
 
-                if (!currentArmMoveParams.useLimits)
-                {
+                if (!currentArmMoveParams.useLimits) {
                     float targetPosition =
                         currentPosition
                         + (float)extendState * fixedDeltaTime * currentArmMoveParams.speed;
@@ -312,9 +273,7 @@ public void ControlJointFromAction(float fixedDeltaTime)
 
                     Debug.Log($"currentPosition: {currentPosition}");
                     Debug.Log($"targetPosition: {targetPosition}");
-                }
-                else
-                {
+                } else {
                     float distanceRemaining =
                         currentArmMoveParams.distance - distanceTransformedSoFar;
                     Debug.Log("DISTANCE REMAINING: " + distanceRemaining);
@@ -327,16 +286,13 @@ public void ControlJointFromAction(float fixedDeltaTime)
                     float targetPosition = currentPosition + direction * distanceRemaining;
 
                     float offset = 1e-2f;
-                    if (extendState == ArmExtendState.MovingForward)
-                    {
+                    if (extendState == ArmExtendState.MovingForward) {
                         drive.upperLimit = Mathf.Min(upperArmExtendLimit, targetPosition + offset);
                         drive.lowerLimit = Mathf.Min(
                             Mathf.Max(lowerArmExtendLimit, currentPosition),
                             targetPosition
                         );
-                    }
-                    else if (extendState == ArmExtendState.MovingBackward)
-                    {
+                    } else if (extendState == ArmExtendState.MovingBackward) {
                         drive.lowerLimit = Mathf.Max(lowerArmExtendLimit, targetPosition);
                         drive.upperLimit = Mathf.Max(
                             Mathf.Min(upperArmExtendLimit, currentPosition + offset),
@@ -368,13 +324,10 @@ public void ControlJointFromAction(float fixedDeltaTime)
 
                     drive.target = targetPosition;
 
-                    if (willReachTargetSoon)
-                    {
+                    if (willReachTargetSoon) {
                         drive.stiffness = 100000f;
                         drive.targetVelocity = -direction * (distanceRemaining / slowDownTime);
-                    }
-                    else
-                    {
+                    } else {
                         drive.stiffness = 0f;
                         Debug.Log($"stiffness should be 0 but it is: {drive.stiffness}");
                         drive.targetVelocity = -direction * currentArmMoveParams.speed;
@@ -403,10 +356,8 @@ public void ControlJointFromAction(float fixedDeltaTime)
             }
         }
         //if we are a revolute joint
-        else if (jointAxisType == JointAxisType.Rotate)
-        {
-            if (rotateState != ArmRotateState.Idle)
-            {
+        else if (jointAxisType == JointAxisType.Rotate) {
+            if (rotateState != ArmRotateState.Idle) {
                 //seems like revolute joints always only have an xDrive, and to change where its rotating
                 //you just rotate the anchor itself, but always access the xDrive
                 var drive = myAB.xDrive;
@@ -453,21 +404,17 @@ public bool shouldHalt(
         List<double> cachedFixedTimeDeltas,
         double minMovementPerSecond,
         double haltCheckTimeWindow
-    )
-    {
+    ) {
         //if we are already in an idle, state, immeidately return true
-        if (jointAxisType == JointAxisType.Lift && liftState == ArmLiftState.Idle)
-        {
+        if (jointAxisType == JointAxisType.Lift && liftState == ArmLiftState.Idle) {
             return true;
         }
 
-        if (jointAxisType == JointAxisType.Extend && extendState == ArmExtendState.Idle)
-        {
+        if (jointAxisType == JointAxisType.Extend && extendState == ArmExtendState.Idle) {
             return true;
         }
 
-        if (jointAxisType == JointAxisType.Rotate && rotateState == ArmRotateState.Idle)
-        {
+        if (jointAxisType == JointAxisType.Rotate && rotateState == ArmRotateState.Idle) {
             return true;
         }
 
@@ -481,24 +428,21 @@ double haltCheckTimeWindow
                 minMovementPerSecond: minMovementPerSecond,
                 haltCheckTimeWindow: haltCheckTimeWindow
             )
-        )
-        {
+        ) {
             shouldHalt = true;
             IdleAllStates();
             Debug.Log("halt due to position delta within tolerance");
             return shouldHalt;
         }
         //check if the amount moved/rotated exceeds this joints target
-        else if (distanceTransformedSoFar >= currentArmMoveParams.distance)
-        {
+        else if (distanceTransformedSoFar >= currentArmMoveParams.distance) {
             shouldHalt = true;
             IdleAllStates();
             Debug.Log("halt due to distance reached/exceeded");
             return shouldHalt;
         }
         //hard check for time limit
-        else if (currentArmMoveParams.timePassed >= currentArmMoveParams.maxTimePassed)
-        {
+        else if (currentArmMoveParams.timePassed >= currentArmMoveParams.maxTimePassed) {
             shouldHalt = true;
             IdleAllStates();
             Debug.Log("halt from timeout");
@@ -508,18 +452,14 @@ double haltCheckTimeWindow
         return shouldHalt;
     }
 
-    private void IdleAllStates()
-    {
-        if (jointAxisType == JointAxisType.Lift)
-        {
+    private void IdleAllStates() {
+        if (jointAxisType == JointAxisType.Lift) {
             liftState = ArmLiftState.Idle;
         }
-        if (jointAxisType == JointAxisType.Extend)
-        {
+        if (jointAxisType == JointAxisType.Extend) {
             extendState = ArmExtendState.Idle;
         }
-        if (jointAxisType == JointAxisType.Rotate)
-        {
+        if (jointAxisType == JointAxisType.Rotate) {
             rotateState = ArmRotateState.Idle;
         }
 
diff --git a/unity/Assets/Scripts/BaseAgentComponent.cs b/unity/Assets/Scripts/BaseAgentComponent.cs
index 9e292e6e21..2c86c1bd6f 100644
--- a/unity/Assets/Scripts/BaseAgentComponent.cs
+++ b/unity/Assets/Scripts/BaseAgentComponent.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [RequireComponent(typeof(CharacterController))]
-    public class BaseAgentComponent : MonoBehaviour
-    {
+    public class BaseAgentComponent : MonoBehaviour {
         // debug draw bounds of objects in editor
 #if UNITY_EDITOR
         protected List<Bounds> gizmobounds = new List<Bounds>();
@@ -38,10 +36,8 @@ public class BaseAgentComponent : MonoBehaviour
 
         public DroneObjectLauncher DroneObjectLauncher;
 
-        void LateUpdate()
-        {
-            if (this.agent == null)
-            {
+        void LateUpdate() {
+            if (this.agent == null) {
                 return;
             }
 
@@ -59,54 +55,44 @@ void LateUpdate()
 #endif
         }
 
-        void FixedUpdate()
-        {
-            if (this.agent != null)
-            {
+        void FixedUpdate() {
+            if (this.agent != null) {
                 this.agent.FixedUpdate();
             }
         }
 
         // Handle collisions - CharacterControllers don't apply physics innately, see "PushMode" check below
         // XXX: this will be used for truly continuous movement over time, for now this is unused
-        protected void OnControllerColliderHit(ControllerColliderHit hit)
-        {
-            if (this.agent == null)
-            {
+        protected void OnControllerColliderHit(ControllerColliderHit hit) {
+            if (this.agent == null) {
                 return;
             }
 
-            if (hit.gameObject.GetComponent<StructureObject>())
-            {
+            if (hit.gameObject.GetComponent<StructureObject>()) {
                 if (
                     hit.gameObject.GetComponent<StructureObject>().WhatIsMyStructureObjectTag
                     == StructureObjectTag.Floor
-                )
-                {
+                ) {
                     return;
                 }
             }
 
-            if (!this.agent.collisionsInAction.Contains(hit.gameObject.name))
-            {
+            if (!this.agent.collisionsInAction.Contains(hit.gameObject.name)) {
                 this.agent.collisionsInAction.Add(hit.gameObject.name);
             }
 
             Rigidbody body = hit.collider.attachedRigidbody;
             // don't move the rigidbody if the character is on top of it
-            if (this.agent.m_CollisionFlags == CollisionFlags.Below)
-            {
+            if (this.agent.m_CollisionFlags == CollisionFlags.Below) {
                 return;
             }
 
-            if (body == null || body.isKinematic)
-            {
+            if (body == null || body.isKinematic) {
                 return;
             }
 
             // push objects out of the way if moving through them and they are Moveable or CanPickup (Physics)
-            if (this.agent.PushMode)
-            {
+            if (this.agent.PushMode) {
                 float pushPower = 2.0f;
                 Vector3 pushDir = new Vector3(hit.moveDirection.x, 0, hit.moveDirection.z);
                 body.velocity = pushDir * pushPower;
diff --git a/unity/Assets/Scripts/BaseFPSAgentController.cs b/unity/Assets/Scripts/BaseFPSAgentController.cs
index 48fcd73e73..2d8ce92c60 100644
--- a/unity/Assets/Scripts/BaseFPSAgentController.cs
+++ b/unity/Assets/Scripts/BaseFPSAgentController.cs
@@ -24,141 +24,114 @@
 using UnityStandardAssets.Utility;
 using Random = UnityEngine.Random;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public abstract class BaseFPSAgentController : ActionInvokable
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public abstract class BaseFPSAgentController : ActionInvokable {
         // debug draw bounds of objects in editor
 #if UNITY_EDITOR
         protected List<Bounds> gizmobounds = new List<Bounds>();
 #endif
         public BaseAgentComponent baseAgentComponent;
 
-        public Transform transform
-        {
+        public Transform transform {
             get => this.baseAgentComponent.transform;
         }
 
-        public GameObject gameObject
-        {
+        public GameObject gameObject {
             get => this.baseAgentComponent.gameObject;
         }
 
-        public Coroutine StartCoroutine(IEnumerator routine)
-        {
+        public Coroutine StartCoroutine(IEnumerator routine) {
             return this.baseAgentComponent.StartCoroutine(routine);
         }
 
         public SimObjPhysics[] VisibleSimObjPhysics;
 
-        public GameObject AgentCamera
-        {
+        public GameObject AgentCamera {
             get => this.baseAgentComponent.AgentCamera;
         }
 
-        public GameObject AgentHand
-        {
+        public GameObject AgentHand {
             get => this.baseAgentComponent.AgentHand;
         }
 
-        protected GameObject DefaultHandPosition
-        {
+        protected GameObject DefaultHandPosition {
             get => this.baseAgentComponent.DefaultHandPosition;
         }
 
-        protected Transform rotPoint
-        {
+        protected Transform rotPoint {
             get => this.baseAgentComponent.rotPoint;
         }
 
-        protected GameObject DebugPointPrefab
-        {
+        protected GameObject DebugPointPrefab {
             get => this.baseAgentComponent.DebugPointPrefab;
         }
 
-        protected GameObject GridRenderer
-        {
+        protected GameObject GridRenderer {
             get => this.baseAgentComponent.GridRenderer;
         }
 
-        protected GameObject DebugTargetPointPrefab
-        {
+        protected GameObject DebugTargetPointPrefab {
             get => this.baseAgentComponent.DebugPointPrefab;
         }
 
-        public GameObject VisibilityCapsule
-        {
+        public GameObject VisibilityCapsule {
             get => this.baseAgentComponent.VisibilityCapsule;
             set => this.baseAgentComponent.VisibilityCapsule = value;
         }
 
-        public GameObject TallVisCap
-        {
+        public GameObject TallVisCap {
             get => this.baseAgentComponent.TallVisCap;
         }
 
-        public GameObject BotVisCap
-        {
+        public GameObject BotVisCap {
             get => this.baseAgentComponent.BotVisCap;
         }
 
-        public GameObject StretchVisCap
-        {
+        public GameObject StretchVisCap {
             get => this.baseAgentComponent.StretchVisCap;
         }
 
-        public GameObject StretchArm
-        {
+        public GameObject StretchArm {
             get => this.baseAgentComponent.StretchArm;
         }
 
-        public GameObject DroneVisCap
-        {
+        public GameObject DroneVisCap {
             get => this.baseAgentComponent.DroneVisCap;
         }
 
-        public DroneObjectLauncher DroneObjectLauncher
-        {
+        public DroneObjectLauncher DroneObjectLauncher {
             get => this.baseAgentComponent.DroneObjectLauncher;
         }
 
-        public GameObject DroneBasket
-        {
+        public GameObject DroneBasket {
             get => this.baseAgentComponent.DroneBasket;
         }
 
-        public GameObject IKArm
-        {
+        public GameObject IKArm {
             get => this.baseAgentComponent.IKArm;
         }
 
         // reference to prefab for activiting the cracked camera effect via CameraCrack()
-        public GameObject CrackedCameraCanvas
-        {
+        public GameObject CrackedCameraCanvas {
             get => this.baseAgentComponent.CrackedCameraCanvas;
         }
 
-        public GameObject[] ToSetActive
-        {
+        public GameObject[] ToSetActive {
             get => this.baseAgentComponent.ToSetActive;
         }
 
-        public Material[] ScreenFaces
-        {
+        public Material[] ScreenFaces {
             get => this.baseAgentComponent.ScreenFaces;
         }
 
-        public MeshRenderer MyFaceMesh
-        {
+        public MeshRenderer MyFaceMesh {
             get => this.baseAgentComponent.MyFaceMesh;
         }
-        public GameObject[] TargetCircles
-        {
+        public GameObject[] TargetCircles {
             get => this.baseAgentComponent.TargetCircles;
         }
 
-        public GameObject[] GripperOpennessStates
-        {
+        public GameObject[] GripperOpennessStates {
             get => this.baseAgentComponent.GripperOpennessStates;
         }
 
@@ -192,15 +165,11 @@ public GameObject[] GripperOpennessStates
         protected bool continuousMode; // deprecated, use snapToGrid instead
         public ImageSynthesis imageSynthesis;
 
-        public ImageSynthesis ImageSynthesis
-        {
-            get
-            {
-                if (this.imageSynthesis == null)
-                {
+        public ImageSynthesis ImageSynthesis {
+            get {
+                if (this.imageSynthesis == null) {
                     imageSynthesis = this.m_Camera.gameObject.GetComponent<ImageSynthesis>();
-                    if (imageSynthesis == null)
-                    {
+                    if (imageSynthesis == null) {
                         throw new NullReferenceException(
                             $"ImageSynthesis component is null or disabled in `{this.m_Camera.gameObject.name}` Gameobject."
                         );
@@ -208,9 +177,7 @@ public ImageSynthesis ImageSynthesis
 
                     imageSynthesis.enabled = true;
                     return imageSynthesis;
-                }
-                else
-                {
+                } else {
                     return imageSynthesis;
                 }
             }
@@ -252,8 +219,7 @@ public ImageSynthesis ImageSynthesis
         public BaseFPSAgentController(
             BaseAgentComponent baseAgentComponent,
             AgentManager agentManager
-        )
-        {
+        ) {
             this.baseAgentComponent = baseAgentComponent;
             this.baseAgentComponent.agent = this;
             this.agentManager = agentManager;
@@ -275,21 +241,16 @@ AgentManager agentManager
             // culling in FirstPersonCharacterCull.cs to ignore tall mode renderers
             HideAllAgentRenderers();
             // default nav mesh agent to false cause WHY DOES THIS BREAK THINGS I GUESS IT DOESN TLIKE TELEPORTING
-            if (this.GetComponentInChildren<NavMeshAgent>())
-            {
+            if (this.GetComponentInChildren<NavMeshAgent>()) {
                 this.GetComponentInChildren<NavMeshAgent>().enabled = false;
             }
 
             // Recording initially disabled renderers and scene bounds
             // then setting up sceneBounds based on encapsulating all renderers
-            foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>())
-            {
-                if (!r.enabled)
-                {
+            foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>()) {
+                if (!r.enabled) {
                     initiallyDisabledRenderers.Add(r.GetInstanceID());
-                }
-                else
-                {
+                } else {
                     agentManager.SceneBounds.Encapsulate(r.bounds);
                 }
             }
@@ -297,8 +258,7 @@ AgentManager agentManager
             // On start, activate gravity
             Vector3 movement = Vector3.zero;
             movement.y = Physics.gravity.y * m_GravityMultiplier;
-            if (this.gameObject.name != "ArticulatedFPSController")
-            {
+            if (this.gameObject.name != "ArticulatedFPSController") {
                 m_CharacterController.Move(movement);
             }
 
@@ -308,52 +268,43 @@ AgentManager agentManager
 #endif
         }
 
-        void Start()
-        {
+        void Start() {
             Debug.Log("------------- BASE FPS Start");
         }
 
         // callback triggered by BaseAgentComponent
         public virtual void FixedUpdate() { }
 
-        public bool IsVisible
-        {
+        public bool IsVisible {
             get { return isVisible; }
-            set
-            {
+            set {
                 // first default all Vis capsules of all modes to not enabled
                 HideAllAgentRenderers();
 
                 // The VisibilityCapsule will be set to either Tall or Bot
                 // from the InitializeBody call in BaseFPSAgentController's Initialize()
-                foreach (Renderer r in VisibilityCapsule.GetComponentsInChildren<Renderer>())
-                {
+                foreach (Renderer r in VisibilityCapsule.GetComponentsInChildren<Renderer>()) {
                     r.enabled = value;
                 }
                 isVisible = value;
             }
         }
 
-        public bool IsProcessing
-        {
+        public bool IsProcessing {
             get { return this.agentState == AgentState.Processing; }
         }
 
         // convenciance function that can be called
         // when autoSyncTransforms is disabled and the
         // transform has been manually moved
-        public void autoSyncTransforms()
-        {
-            if (!Physics.autoSyncTransforms)
-            {
+        public void autoSyncTransforms() {
+            if (!Physics.autoSyncTransforms) {
                 Physics.SyncTransforms();
             }
         }
 
-        public bool ReadyForCommand
-        {
-            get
-            {
+        public bool ReadyForCommand {
+            get {
                 return this.agentState == AgentState.Emit
                     || this.agentState == AgentState.ActionComplete;
             }
@@ -430,12 +381,9 @@ public Quaternion TargetRotation
         private PhysicsSceneManager _physicsSceneManager = null;
 
         // use as reference to the PhysicsSceneManager object
-        protected PhysicsSceneManager physicsSceneManager
-        {
-            get
-            {
-                if (_physicsSceneManager == null)
-                {
+        protected PhysicsSceneManager physicsSceneManager {
+            get {
+                if (_physicsSceneManager == null) {
                     _physicsSceneManager = GameObject
                         .Find("PhysicsSceneManager")
                         .GetComponent<PhysicsSceneManager>();
@@ -444,49 +392,38 @@ protected PhysicsSceneManager physicsSceneManager
             }
         }
 
-        public void DeleteMe()
-        {
+        public void DeleteMe() {
             actionFinished(success: true, actionReturn: "called in build!");
         }
 
         // defaults all agent renderers, from all modes (tall, bot, drone), to hidden for initialization default
-        protected void HideAllAgentRenderers()
-        {
+        protected void HideAllAgentRenderers() {
             if (
                 TallVisCap != null
                 && BotVisCap != null
                 && DroneVisCap != null
                 && StretchVisCap != null
-            )
-            {
-                foreach (Renderer r in TallVisCap.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+            ) {
+                foreach (Renderer r in TallVisCap.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         r.enabled = false;
                     }
                 }
 
-                foreach (Renderer r in BotVisCap.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in BotVisCap.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         r.enabled = false;
                     }
                 }
 
-                foreach (Renderer r in DroneVisCap.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in DroneVisCap.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         r.enabled = false;
                     }
                 }
 
-                foreach (Renderer r in StretchVisCap.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in StretchVisCap.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         r.enabled = false;
                     }
                 }
@@ -497,10 +434,8 @@ public void actionFinishedEmit(
             bool success,
             object actionReturn = null,
             string errorMessage = null
-        )
-        {
-            if (errorMessage != null)
-            {
+        ) {
+            if (errorMessage != null) {
                 this.errorMessage = errorMessage;
             }
             actionFinished(success: success, newState: AgentState.Emit, actionReturn: actionReturn);
@@ -510,10 +445,8 @@ protected virtual void actionFinished(
             bool success,
             AgentState newState,
             object actionReturn = null
-        )
-        {
-            if (!this.IsProcessing)
-            {
+        ) {
+            if (!this.IsProcessing) {
                 Debug.LogError("ActionFinished called with agentState not in processing ");
             }
 
@@ -521,8 +454,7 @@ protected virtual void actionFinished(
                 (!Physics.autoSyncTransforms)
                 && lastActionInitialPhysicsSimulateCount
                     == PhysicsSceneManager.PhysicsSimulateCallCount
-            )
-            {
+            ) {
                 Physics.SyncTransforms();
             }
 
@@ -536,26 +468,20 @@ protected virtual void actionFinished(
             Debug.Log($"lastAction: '{this.lastAction}'");
             Debug.Log($"lastActionSuccess: '{success}'");
             Debug.Log($"actionReturn: '{actionReturn}'");
-            if (!success)
-            {
+            if (!success) {
                 Debug.Log($"Action failed with error message '{this.errorMessage}'.");
-            }
-            else if (actionReturn != null)
-            {
+            } else if (actionReturn != null) {
                 Debug.Log($"actionReturn: '{actionReturn}'");
             }
 
 #endif
         }
 
-        public virtual void Complete(ActionFinished result)
-        {
+        public virtual void Complete(ActionFinished result) {
             // Check to not call `actionFinished` twice and overwriting values when running in new mode
             // TODO: remove check once legacy actions are gone.
-            if (!result.isDummy)
-            {
-                if (result.errorMessage != null)
-                {
+            if (!result.isDummy) {
+                if (result.errorMessage != null) {
                     this.errorMessage = result.errorMessage;
                 }
                 this.errorCode = result.errorCode;
@@ -572,10 +498,8 @@ public virtual void actionFinished(
             bool success,
             object actionReturn = null,
             string errorMessage = null
-        )
-        {
-            if (errorMessage != null)
-            {
+        ) {
+            if (errorMessage != null) {
                 this.errorMessage = errorMessage;
             }
             actionFinished(
@@ -588,11 +512,9 @@ public virtual void actionFinished(
 
         protected virtual void resumePhysics() { }
 
-        protected virtual CapsuleData GetAgentCapsule()
-        {
+        protected virtual CapsuleData GetAgentCapsule() {
             var cc = GetComponent<CapsuleCollider>();
-            return new CapsuleData
-            {
+            return new CapsuleData {
                 radius = cc.radius,
                 height = cc.height,
                 center = cc.center,
@@ -608,8 +530,7 @@ public Vector3[] getReachablePositions(
             float gridWidth = 0.045f,
             bool directionsRelativeAgent = false,
             float? gridSize = null
-        )
-        { // max step count represents a 100m * 100m room. Adjust this value later if we end up making bigger rooms?
+        ) { // max step count represents a 100m * 100m room. Adjust this value later if we end up making bigger rooms?
             CapsuleData capsule = GetAgentCapsule();
 
             // Debug.Log($"Capsule collider: {cc.radius}, height {cc.height}, innerheight: {cc.height / 2.0f - cc.radius;} startpos: {transform.position + cc.transform.TransformDirection(cc.center)}");
@@ -619,8 +540,7 @@ public Vector3[] getReachablePositions(
                 $"Capsule collider: {capsule.radius}  height {capsule.height}, innerheight: {capsule.height / 2.0f - capsule.radius} startpos: {transform.position + capsule.transform.TransformDirection(capsule.center)}"
             );
 
-            if (!gridSize.HasValue)
-            {
+            if (!gridSize.HasValue) {
                 gridSize = BaseFPSAgentController.gridSize;
             }
             // TODO: skin width for ab
@@ -631,13 +551,10 @@ public Vector3[] getReachablePositions(
 
             Vector3 right;
             Vector3 forward;
-            if (directionsRelativeAgent)
-            {
+            if (directionsRelativeAgent) {
                 right = transform.right;
                 forward = transform.forward;
-            }
-            else
-            {
+            } else {
                 right = new Vector3(1.0f, 0.0f, 0.0f);
                 forward = new Vector3(0.0f, 0.0f, 1.0f);
             }
@@ -654,8 +571,7 @@ public Vector3[] getReachablePositions(
                 "Procedural0"
             );
             int stepsTaken = 0;
-            while (rightForwardQueue.Count != 0)
-            {
+            while (rightForwardQueue.Count != 0) {
                 stepsTaken += 1;
 
                 // Computing the new position based using an offset from the startPosition
@@ -667,15 +583,13 @@ public Vector3[] getReachablePositions(
                     + gridSize.Value
                         * gridMultiplier
                         * (right * rightForward.Item1 + forward * rightForward.Item2);
-                if (!goodPoints.Contains(p))
-                {
+                if (!goodPoints.Contains(p)) {
                     goodPoints.Add(p);
                     HashSet<Collider> objectsAlreadyColliding = new HashSet<Collider>(
                         objectsCollidingWithAgent()
                     );
 
-                    foreach ((int, int) rightForwardOffset in rightForwardOffsets)
-                    {
+                    foreach ((int, int) rightForwardOffset in rightForwardOffsets) {
                         (int, int) newRightForward = (
                             rightForward.Item1 + rightForwardOffset.Item1,
                             rightForward.Item2 + rightForwardOffset.Item2
@@ -685,8 +599,7 @@ public Vector3[] getReachablePositions(
                             + gridSize.Value
                                 * gridMultiplier
                                 * (right * newRightForward.Item1 + forward * newRightForward.Item2);
-                        if (seenRightForwards.Contains(newRightForward))
-                        {
+                        if (seenRightForwards.Contains(newRightForward)) {
                             continue;
                         }
                         seenRightForwards.Add(newRightForward);
@@ -702,27 +615,23 @@ public Vector3[] getReachablePositions(
                         );
 
                         bool shouldEnqueue = true;
-                        foreach (RaycastHit hit in hits)
-                        {
+                        foreach (RaycastHit hit in hits) {
                             if (
                                 !ancestorHasName(hit.transform.gameObject, "Floor")
                                 && !ancestorHasName(hit.transform.gameObject, "FPSController")
                                 && !objectsAlreadyColliding.Contains(hit.collider)
-                            )
-                            {
+                            ) {
                                 shouldEnqueue = false;
                                 break;
                             }
                         }
 
-                        if (!shouldEnqueue)
-                        {
+                        if (!shouldEnqueue) {
                             continue;
                         }
 
                         bool inBounds = agentManager.SceneBounds.Contains(newPosition);
-                        if (shouldEnqueue && !inBounds)
-                        {
+                        if (shouldEnqueue && !inBounds) {
                             throw new InvalidOperationException(
                                 "In "
                                     + UnityEngine.SceneManagement.SceneManager.GetActiveScene().name
@@ -741,19 +650,16 @@ public Vector3[] getReachablePositions(
                                 || handObjectCanFitInPosition(newPosition, 180.0f)
                                 || handObjectCanFitInPosition(newPosition, 270.0f)
                             );
-                        if (shouldEnqueue)
-                        {
+                        if (shouldEnqueue) {
                             rightForwardQueue.Enqueue(newRightForward);
 
-                            if (visualize)
-                            {
+                            if (visualize) {
                                 var gridRenderer =
                                     Instantiate(GridRenderer, Vector3.zero, Quaternion.identity)
                                     as GameObject;
                                 var gridLineRenderer =
                                     gridRenderer.GetComponentInChildren<LineRenderer>();
-                                if (gridColor.HasValue)
-                                {
+                                if (gridColor.HasValue) {
                                     gridLineRenderer.startColor = gridColor.Value;
                                     gridLineRenderer.endColor = gridColor.Value;
                                 }
@@ -772,14 +678,13 @@ public Vector3[] getReachablePositions(
                                 );
                             }
 #if UNITY_EDITOR
-                            Debug.DrawLine(p, newPosition, Color.cyan, 100000f);
+                            // Debug.DrawLine(p, newPosition, Color.cyan, 100000f);
 #endif
                         }
                     }
                 }
                 // default maxStepCount to scale based on gridSize
-                if (stepsTaken > Math.Floor(maxStepCount / (gridSize.Value * gridSize.Value)))
-                {
+                if (stepsTaken > Math.Floor(maxStepCount / (gridSize.Value * gridSize.Value))) {
                     throw new InvalidOperationException(
                         "Too many steps taken in GetReachablePositions."
                     );
@@ -808,19 +713,15 @@ public void GetReachablePositions(
             int? maxStepCount = null,
             bool directionsRelativeAgent = false,
             float? gridSize = null
-        )
-        {
+        ) {
             Vector3[] reachablePositions;
-            if (maxStepCount.HasValue)
-            {
+            if (maxStepCount.HasValue) {
                 reachablePositions = getReachablePositions(
                     maxStepCount: maxStepCount.Value,
                     directionsRelativeAgent: directionsRelativeAgent,
                     gridSize: gridSize
                 );
-            }
-            else
-            {
+            } else {
                 reachablePositions = getReachablePositions(
                     directionsRelativeAgent: directionsRelativeAgent,
                     gridSize: gridSize
@@ -832,8 +733,7 @@ public void GetReachablePositions(
 
         public abstract ActionFinished InitializeBody(ServerAction initializeAction);
 
-        protected bool ValidRotateStepDegreesWithSnapToGrid(float rotateDegrees)
-        {
+        protected bool ValidRotateStepDegreesWithSnapToGrid(float rotateDegrees) {
             // float eps = 0.00001f;
             return rotateDegrees == 90.0f
                 || rotateDegrees == 180.0f
@@ -841,36 +741,27 @@ protected bool ValidRotateStepDegreesWithSnapToGrid(float rotateDegrees)
                 || (rotateDegrees % 360.0f) == 0.0f;
         }
 
-        public void Initialize(ServerAction action)
-        {
+        public void Initialize(ServerAction action) {
             // Debug.Log("RUNNING B");
             // limit camera from looking too far down/up
             //default max are 30 up and 60 down, different agent types may overwrite this
-            if (Mathf.Approximately(action.maxUpwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(action.maxUpwardLookAngle, 0.0f)) {
                 this.maxUpwardLookAngle = 30f;
-            }
-            else
-            {
+            } else {
                 this.maxUpwardLookAngle = action.maxUpwardLookAngle;
             }
 
-            if (Mathf.Approximately(action.maxDownwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(action.maxDownwardLookAngle, 0.0f)) {
                 this.maxDownwardLookAngle = 60f;
-            }
-            else
-            {
+            } else {
                 this.maxDownwardLookAngle = action.maxDownwardLookAngle;
             }
 
-            if (action.agentMode != "fpin")
-            {
+            if (action.agentMode != "fpin") {
                 this.InitializeBody(action);
             }
 
-            if (action.antiAliasing != null)
-            {
+            if (action.antiAliasing != null) {
                 agentManager.updateAntiAliasing(
                     postProcessLayer: m_Camera.gameObject.GetComponentInChildren<PostProcessLayer>(),
                     antiAliasing: action.antiAliasing
@@ -880,51 +771,40 @@ public void Initialize(ServerAction action)
                 .GetComponent<FirstPersonCharacterCull>()
                 .SwitchRenderersToHide(this.VisibilityCapsule);
 
-            if (action.gridSize == 0)
-            {
+            if (action.gridSize == 0) {
                 action.gridSize = 0.25f;
             }
 
             // note: this overrides the default FOV values set in InitializeBody()
-            if (action.fieldOfView > 0 && action.fieldOfView < 180)
-            {
+            if (action.fieldOfView > 0 && action.fieldOfView < 180) {
                 m_Camera.fieldOfView = action.fieldOfView;
-            }
-            else if (action.fieldOfView < 0 || action.fieldOfView >= 180)
-            {
+            } else if (action.fieldOfView < 0 || action.fieldOfView >= 180) {
                 errorMessage = "fov must be set to (0, 180) noninclusive.";
                 Debug.Log(errorMessage);
                 actionFinished(false);
                 return;
             }
 
-            if (action.cameraNearPlane > 0)
-            {
+            if (action.cameraNearPlane > 0) {
                 m_Camera.nearClipPlane = action.cameraNearPlane;
             }
 
-            if (action.cameraFarPlane > 0)
-            {
+            if (action.cameraFarPlane > 0) {
                 m_Camera.farClipPlane = action.cameraFarPlane;
             }
 
-            if (action.timeScale > 0)
-            {
-                if (Time.timeScale != action.timeScale)
-                {
+            if (action.timeScale > 0) {
+                if (Time.timeScale != action.timeScale) {
                     Time.timeScale = action.timeScale;
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "Time scale must be > 0";
                 Debug.Log(errorMessage);
                 actionFinished(false);
                 return;
             }
 
-            if (action.rotateStepDegrees <= 0.0)
-            {
+            if (action.rotateStepDegrees <= 0.0) {
                 errorMessage = "rotateStepDegrees must be a non-zero, non-negative float";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -932,15 +812,13 @@ public void Initialize(ServerAction action)
             }
 
             // default is 90 defined in the ServerAction class, specify whatever you want the default to be
-            if (action.rotateStepDegrees > 0.0)
-            {
+            if (action.rotateStepDegrees > 0.0) {
                 this.rotateStepDegrees = action.rotateStepDegrees;
             }
 
             if (
                 action.snapToGrid && !ValidRotateStepDegreesWithSnapToGrid(action.rotateStepDegrees)
-            )
-            {
+            ) {
                 errorMessage =
                     $"Invalid values 'rotateStepDegrees': ${action.rotateStepDegrees} and 'snapToGrid':${action.snapToGrid}. 'snapToGrid': 'True' is not supported when 'rotateStepDegrees' is different from grid rotation steps of 0, 90, 180, 270 or 360.";
                 Debug.Log(errorMessage);
@@ -948,16 +826,14 @@ public void Initialize(ServerAction action)
                 return;
             }
 
-            if (action.maxDownwardLookAngle < 0)
-            {
+            if (action.maxDownwardLookAngle < 0) {
                 errorMessage = "maxDownwardLookAngle must be a non-negative float";
                 Debug.Log(errorMessage);
                 actionFinished(false);
                 return;
             }
 
-            if (action.maxUpwardLookAngle < 0)
-            {
+            if (action.maxUpwardLookAngle < 0) {
                 errorMessage = "maxUpwardLookAngle must be a non-negative float";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -971,21 +847,18 @@ public void Initialize(ServerAction action)
                 || action.renderSemanticSegmentation
                 || action.renderInstanceSegmentation
                 || action.renderNormalsImage
-            )
-            {
+            ) {
                 this.updateImageSynthesis(true);
             }
 
-            if (action.visibilityDistance > 0.0f)
-            {
+            if (action.visibilityDistance > 0.0f) {
                 this.maxVisibleDistance = action.visibilityDistance;
             }
 
             var navmeshAgent = this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>();
             var collider = this.GetComponent<CapsuleCollider>();
 
-            if (collider != null && navmeshAgent != null)
-            {
+            if (collider != null && navmeshAgent != null) {
                 navmeshAgent.radius = collider.radius;
                 navmeshAgent.height = collider.height;
                 navmeshAgent.transform.localPosition = new Vector3(
@@ -997,15 +870,12 @@ public void Initialize(ServerAction action)
 
             // navmeshAgent.radius =
 
-            if (action.gridSize <= 0 || action.gridSize > 5)
-            {
+            if (action.gridSize <= 0 || action.gridSize > 5) {
                 errorMessage = "grid size must be in the range (0,5]";
                 Debug.Log(errorMessage);
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 gridSize = action.gridSize;
                 StartCoroutine(checkInitializeAgentLocationAction());
             }
@@ -1018,14 +888,12 @@ public void Initialize(ServerAction action)
             if (
                 action.controllerInitialization != null
                 && action.controllerInitialization.variableInitializations != null
-            )
-            {
+            ) {
                 foreach (
                     KeyValuePair<string, TypedVariable> entry in action
                         .controllerInitialization
                         .variableInitializations
-                )
-                {
+                ) {
                     Debug.Log(" Key " + entry.Value.type + " field " + entry.Key);
                     Type t = Type.GetType(entry.Value.type);
                     FieldInfo field = t.GetField(
@@ -1042,12 +910,10 @@ KeyValuePair<string, TypedVariable> entry in action
             // Debug.Log("True if physics is auto-simulating: " + Physics.autoSimulation);
         }
 
-        public IEnumerator checkInitializeAgentLocationAction()
-        {
+        public IEnumerator checkInitializeAgentLocationAction() {
             yield return null;
 
-            if (agentManager.agentMode != "stretchab")
-            {
+            if (agentManager.agentMode != "stretchab") {
                 Vector3 startingPosition = this.transform.position;
                 // move ahead
                 // move back
@@ -1063,10 +929,8 @@ public IEnumerator checkInitializeAgentLocationAction()
                 float[] xs = new float[] { grid_x1, grid_x1 + gridSize };
                 float[] zs = new float[] { grid_z1, grid_z1 + gridSize };
                 List<Vector3> validMovements = new List<Vector3>();
-                foreach (float x in xs)
-                {
-                    foreach (float z in zs)
-                    {
+                foreach (float x in xs) {
+                    foreach (float z in zs) {
                         this.transform.position = startingPosition;
                         autoSyncTransforms();
 
@@ -1077,25 +941,21 @@ public IEnumerator checkInitializeAgentLocationAction()
                         Vector3 dir = target - this.transform.position;
                         Vector3 movement = dir.normalized * 100.0f;
                         // Debug.Log("Target is at " + target + ", dir is at " + dir.y + ", and movement is " + movement);
-                        if (movement.magnitude > dir.magnitude)
-                        {
+                        if (movement.magnitude > dir.magnitude) {
                             movement = dir;
                         }
                         // Debug.Log("PRE: movement-y is " + movement.y);
                         movement.y = Physics.gravity.y * this.m_GravityMultiplier;
                         // Debug.Log("POST: movement-y is  " + movement.y);
-                        if (agentManager.agentMode != "stretchab")
-                        {
+                        if (agentManager.agentMode != "stretchab") {
                             m_CharacterController.Move(movement);
                             // Debug.Log("THIS SHOULDN'T BE SHOWING, but somehow agentMode is " + agentManager.agentMode);
                         }
-                        for (int i = 0; i < actionDuration; i++)
-                        {
+                        for (int i = 0; i < actionDuration; i++) {
                             yield return null;
                             Vector3 diff = this.transform.position - target;
 
-                            if ((Math.Abs(diff.x) < 0.005) && (Math.Abs(diff.z) < 0.005))
-                            {
+                            if ((Math.Abs(diff.x) < 0.005) && (Math.Abs(diff.z) < 0.005)) {
                                 validMovements.Add(movement);
                                 break;
                             }
@@ -1107,8 +967,7 @@ public IEnumerator checkInitializeAgentLocationAction()
                 autoSyncTransforms();
                 yield return null;
 
-                if (validMovements.Count > 0)
-                {
+                if (validMovements.Count > 0) {
                     //Debug.Log("Initialize: got total valid initial targets: " + validMovements.Count);
                     Vector3 firstMove = validMovements[0];
                     // Debug.Log("First move is this: " + firstMove);
@@ -1122,26 +981,20 @@ public IEnumerator checkInitializeAgentLocationAction()
 
                     actionFinished(
                         true,
-                        new InitializeReturn
-                        {
+                        new InitializeReturn {
                             cameraNearPlane = m_Camera.nearClipPlane,
                             cameraFarPlane = m_Camera.farClipPlane
                         }
                     );
-                }
-                else
-                {
+                } else {
                     // Debug.Log("Initialize: no valid starting positions found");
                     actionFinished(false);
                 }
-            }
-            else
-            {
+            } else {
                 yield return null;
                 actionFinished(
                     true,
-                    new InitializeReturn
-                    {
+                    new InitializeReturn {
                         cameraNearPlane = m_Camera.nearClipPlane,
                         cameraFarPlane = m_Camera.farClipPlane
                     }
@@ -1153,13 +1006,11 @@ public IEnumerator checkInitializeAgentLocationAction()
             message: "This action is deprecated. Call RandomizeColors instead.",
             error: false
         )]
-        public void ChangeColorOfMaterials()
-        {
+        public void ChangeColorOfMaterials() {
             RandomizeColors();
         }
 
-        public void RandomizeColors()
-        {
+        public void RandomizeColors() {
             ColorChanger colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
             colorChangeComponent.RandomizeColor();
             agentManager.doResetMaterials = true;
@@ -1167,8 +1018,7 @@ public void RandomizeColors()
         }
 
         // returns a <string, string[]> dict of object types and all cached materials used in the Material Randomizer logic
-        public void GetMaterials()
-        {
+        public void GetMaterials() {
             ColorChanger colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
             actionFinishedEmit(true, colorChangeComponent.GetMaterials());
         }
@@ -1186,8 +1036,7 @@ public void RandomizeMaterials(
             bool? useExternalMaterials = null,
             string[] inRoomTypes = null,
             List<string> excludedObjectIds = null
-        )
-        {
+        ) {
             string scene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
             HashSet<string> validRoomTypes = new HashSet<string>()
             {
@@ -1199,17 +1048,13 @@ public void RandomizeMaterials(
             };
 
             HashSet<string> chosenRoomTypes = new HashSet<string>();
-            if (inRoomTypes != null)
-            {
-                if (inRoomTypes.Length == 0)
-                {
+            if (inRoomTypes != null) {
+                if (inRoomTypes.Length == 0) {
                     throw new ArgumentException("inRoomTypes must have a non-zero length!");
                 }
 
-                foreach (string roomType in inRoomTypes)
-                {
-                    if (!validRoomTypes.Contains(roomType.ToLower()))
-                    {
+                foreach (string roomType in inRoomTypes) {
+                    if (!validRoomTypes.Contains(roomType.ToLower())) {
                         throw new ArgumentException(
                             $"inRoomTypes contains unknown room type: {roomType}.\n"
                                 + "Valid room types include {\"Bedroom\", \"Bathroom\", \"LivingRoom\", \"Kitchen\", \"RoboTHOR\"}"
@@ -1220,8 +1065,7 @@ public void RandomizeMaterials(
                 }
             }
 
-            if ((!scene.StartsWith("Procedural")) && excludedObjectIds != null)
-            {
+            if ((!scene.StartsWith("Procedural")) && excludedObjectIds != null) {
                 // The reason for the error below is that we need to be sure that every
                 // object contains references to its own materials. This is not
                 // necessarily the case in some ithor scenes because some objects
@@ -1232,26 +1076,21 @@ public void RandomizeMaterials(
                 );
             }
 
-            if (excludedObjectIds == null)
-            {
+            if (excludedObjectIds == null) {
                 excludedObjectIds = new List<string>();
             }
 
             HashSet<string> excludedMaterialNames = new HashSet<string>();
-            foreach (string objectId in excludedObjectIds)
-            {
+            foreach (string objectId in excludedObjectIds) {
                 Debug.Log($"Exclude materials from {objectId}");
                 SimObjPhysics objectWhoseMaterialsToExclude =
                     physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
                 foreach (
                     var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>()
-                )
-                {
-                    foreach (var mat in renderer.sharedMaterials)
-                    {
-                        if (mat != null && mat.name != null)
-                        {
+                ) {
+                    foreach (var mat in renderer.sharedMaterials) {
+                        if (mat != null && mat.name != null) {
                             Debug.Log($"excluding {mat.name}");
                             excludedMaterialNames.Add(mat.name);
                         }
@@ -1260,8 +1099,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
             }
 
             ColorChanger colorChangeComponent;
-            if (scene.StartsWith("Procedural"))
-            {
+            if (scene.StartsWith("Procedural")) {
                 colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
                 colorChangeComponent.RandomizeMaterials(
                     useTrainMaterials: useTrainMaterials.HasValue ? useTrainMaterials.Value : true,
@@ -1282,8 +1120,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
             }
 
             string sceneType;
-            if (scene.EndsWith("_physics"))
-            {
+            if (scene.EndsWith("_physics")) {
                 // iTHOR scene
                 int sceneNumber =
                     Int32.Parse(
@@ -1301,8 +1138,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                         )
                     ) / 100;
 
-                if (inRoomTypes != null)
-                {
+                if (inRoomTypes != null) {
                     string sceneGroupName = new string[]
                     {
                         "kitchen",
@@ -1310,33 +1146,24 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                         "bedroom",
                         "bathroom"
                     }[Math.Max(sceneGroup - 1, 0)];
-                    if (!chosenRoomTypes.Contains(sceneGroupName))
-                    {
+                    if (!chosenRoomTypes.Contains(sceneGroupName)) {
                         throw new ArgumentException(
                             $"inRoomTypes must include \"{sceneGroupName}\" inside of a {sceneGroupName} scene: {scene}."
                         );
                     }
                 }
 
-                if (sceneNumber >= 1 && sceneNumber <= 20)
-                {
+                if (sceneNumber >= 1 && sceneNumber <= 20) {
                     sceneType = "train";
-                }
-                else if (sceneNumber <= 25)
-                {
+                } else if (sceneNumber <= 25) {
                     sceneType = "val";
-                }
-                else
-                {
+                } else {
                     sceneType = "test";
                 }
-            }
-            else
-            {
+            } else {
                 // RoboTHOR scene
                 string chars = scene.Substring(startIndex: "FloorPlan_".Length, length: 2);
-                switch (chars)
-                {
+                switch (chars) {
                     case "Tr":
                         sceneType = "train";
                         break;
@@ -1351,10 +1178,8 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                             $"Unknown scene name: {scene}. Please open an issue on allenai/ai2thor."
                         );
                 }
-                if (inRoomTypes != null)
-                {
-                    if (!chosenRoomTypes.Contains("robothor"))
-                    {
+                if (inRoomTypes != null) {
+                    if (!chosenRoomTypes.Contains("robothor")) {
                         throw new ArgumentException(
                             $"inRoomTypes must include \"RoboTHOR\" inside of a RoboTHOR scene: {scene}."
                         );
@@ -1362,11 +1187,9 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                 }
             }
 
-            switch (sceneType)
-            {
+            switch (sceneType) {
                 case "train":
-                    if (useTrainMaterials.GetValueOrDefault(true) == false)
-                    {
+                    if (useTrainMaterials.GetValueOrDefault(true) == false) {
                         throw new ArgumentException(
                             "Inside of RandomizeMaterials, cannot set useTrainMaterials=false inside of a train scene."
                         );
@@ -1377,8 +1200,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                     useExternalMaterials = useExternalMaterials.GetValueOrDefault(true);
                     break;
                 case "val":
-                    if (useValMaterials.GetValueOrDefault(true) == false)
-                    {
+                    if (useValMaterials.GetValueOrDefault(true) == false) {
                         throw new ArgumentException(
                             "Inside of RandomizeMaterials, cannot set useValMaterials=false inside of a val scene."
                         );
@@ -1389,8 +1211,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
                     useExternalMaterials = useExternalMaterials.GetValueOrDefault(false);
                     break;
                 case "test":
-                    if (useTestMaterials.GetValueOrDefault(true) == false)
-                    {
+                    if (useTestMaterials.GetValueOrDefault(true) == false) {
                         throw new ArgumentException(
                             "Inside of RandomizeMaterials, cannot set useTestMaterials=false inside of a test scene."
                         );
@@ -1421,8 +1242,7 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
 
             actionFinished(
                 success: true,
-                actionReturn: new Dictionary<string, object>()
-                {
+                actionReturn: new Dictionary<string, object>() {
                     ["chosenRoomTypes"] =
                         chosenRoomTypes.Count == 0 ? validRoomTypes : chosenRoomTypes,
                     ["useTrainMaterials"] = useTrainMaterials.Value,
@@ -1434,14 +1254,12 @@ var renderer in objectWhoseMaterialsToExclude.GetComponentsInChildren<Renderer>(
             );
         }
 
-        public void ResetMaterials()
-        {
+        public void ResetMaterials() {
             agentManager.resetMaterials();
             actionFinished(true);
         }
 
-        public void ResetColors()
-        {
+        public void ResetColors() {
             agentManager.resetColors();
             actionFinished(true);
         }
@@ -1478,69 +1296,56 @@ public void RandomizeLighting(
             bool randomizeColor = true,
             float[] hue = null,
             float[] saturation = null
-        )
-        {
-            if (!randomizeColor && (hue != null || saturation != null))
-            {
-                if (hue != null)
-                {
+        ) {
+            if (!randomizeColor && (hue != null || saturation != null)) {
+                if (hue != null) {
                     throw new ArgumentException(
                         $"Cannot pass in randomizeColor=False while also providing hue={hue}."
                     );
                 }
-                if (saturation != null)
-                {
+                if (saturation != null) {
                     throw new ArgumentException(
                         $"Cannot pass in randomizeColor=False while also providing saturation={saturation}."
                     );
                 }
             }
 
-            if (brightness == null)
-            {
+            if (brightness == null) {
                 brightness = new float[] { 0.5f, 1.5f };
             }
-            if (brightness[0] < 0 || brightness[1] < 0)
-            {
+            if (brightness[0] < 0 || brightness[1] < 0) {
                 throw new ArgumentOutOfRangeException(
                     $"Each brightness must be >= 0, not brightness={brightness}."
                 );
             }
 
-            if (hue == null)
-            {
+            if (hue == null) {
                 hue = new float[] { 0, 1 };
             }
-            if (saturation == null)
-            {
+            if (saturation == null) {
                 saturation = new float[] { 0.5f, 1 };
             }
 
-            if (saturation.Length != 2 || hue.Length != 2 || brightness.Length != 2)
-            {
+            if (saturation.Length != 2 || hue.Length != 2 || brightness.Length != 2) {
                 throw new ArgumentException(
                     "Ranges for hue, saturation, and brightness must each have 2 values. You gave "
                         + $"saturation={saturation}, hue={hue}, brightness={brightness}."
                 );
             }
 
-            if (hue[0] < 0 || hue[0] > 1 || hue[1] < 0 || hue[1] > 1)
-            {
+            if (hue[0] < 0 || hue[0] > 1 || hue[1] < 0 || hue[1] > 1) {
                 throw new ArgumentOutOfRangeException($"hue range must be in [0:1], not {hue}");
             }
-            if (saturation[0] < 0 || saturation[0] > 1 || saturation[1] < 0 || saturation[1] > 1)
-            {
+            if (saturation[0] < 0 || saturation[0] > 1 || saturation[1] < 0 || saturation[1] > 1) {
                 throw new ArgumentOutOfRangeException(
                     $"saturation range must be in [0:1], not {saturation}"
                 );
             }
 
-            float newRandomFloat()
-            {
+            float newRandomFloat() {
                 return Random.Range(brightness[0], brightness[1]);
             }
-            Color newRandomColor()
-            {
+            Color newRandomColor() {
                 // NOTE: This function weirdly IGNORES out of bounds arguments.
                 //       So, they are checked above.
                 // NOTE: value is an extraneous degree of freedom here,
@@ -1560,25 +1365,20 @@ Color newRandomColor()
             Color randomColor = newRandomColor();
 
             bool setOriginalMultipliers = originalLightingValues == null;
-            if (setOriginalMultipliers)
-            {
+            if (setOriginalMultipliers) {
                 originalLightingValues = new Dictionary<int, Dictionary<string, object>>();
             }
 
             // include both lights and reflection probes
             Light[] lights = GameObject.FindObjectsOfType<Light>();
-            foreach (Light light in lights)
-            {
-                if (!synchronized)
-                {
+            foreach (Light light in lights) {
+                if (!synchronized) {
                     intensityMultiplier = newRandomFloat();
                     randomColor = newRandomColor();
                 }
                 int id = light.gameObject.GetInstanceID();
-                if (setOriginalMultipliers)
-                {
-                    originalLightingValues[id] = new Dictionary<string, object>()
-                    {
+                if (setOriginalMultipliers) {
+                    originalLightingValues[id] = new Dictionary<string, object>() {
                         // NOTE: make sure these are synced with ResetLighting()!
                         ["intensity"] = light.intensity,
                         ["range"] = light.range,
@@ -1588,25 +1388,20 @@ Color newRandomColor()
                 light.intensity =
                     (float)originalLightingValues[id]["intensity"] * intensityMultiplier;
                 light.range = (float)originalLightingValues[id]["range"] * intensityMultiplier;
-                if (randomizeColor)
-                {
+                if (randomizeColor) {
                     light.color = randomColor;
                 }
             }
 
             ReflectionProbe[] reflectionProbes = GameObject.FindObjectsOfType<ReflectionProbe>();
-            foreach (ReflectionProbe reflectionProbe in reflectionProbes)
-            {
-                if (!synchronized)
-                {
+            foreach (ReflectionProbe reflectionProbe in reflectionProbes) {
+                if (!synchronized) {
                     intensityMultiplier = newRandomFloat();
                 }
                 int id = reflectionProbe.gameObject.GetInstanceID();
-                if (setOriginalMultipliers)
-                {
+                if (setOriginalMultipliers) {
                     // NOTE: make sure these are synced with ResetLighting()!
-                    originalLightingValues[id] = new Dictionary<string, object>()
-                    {
+                    originalLightingValues[id] = new Dictionary<string, object>() {
                         ["intensity"] = reflectionProbe.intensity,
                         ["blendDistance"] = reflectionProbe.intensity
                     };
@@ -1622,17 +1417,14 @@ Color newRandomColor()
             actionFinished(success: true);
         }
 
-        public void ResetLighting()
-        {
-            if (originalLightingValues == null)
-            {
+        public void ResetLighting() {
+            if (originalLightingValues == null) {
                 actionFinishedEmit(success: true);
                 return;
             }
 
             Light[] lights = GameObject.FindObjectsOfType<Light>();
-            foreach (Light light in lights)
-            {
+            foreach (Light light in lights) {
                 int id = light.gameObject.GetInstanceID();
                 light.intensity = (float)originalLightingValues[id]["intensity"];
                 light.range = (float)originalLightingValues[id]["range"];
@@ -1640,8 +1432,7 @@ public void ResetLighting()
             }
 
             ReflectionProbe[] reflectionProbes = GameObject.FindObjectsOfType<ReflectionProbe>();
-            foreach (ReflectionProbe reflectionProbe in reflectionProbes)
-            {
+            foreach (ReflectionProbe reflectionProbe in reflectionProbes) {
                 int id = reflectionProbe.gameObject.GetInstanceID();
                 reflectionProbe.intensity = (float)originalLightingValues[id]["intensity"];
                 reflectionProbe.blendDistance = (float)originalLightingValues[id]["blendDistance"];
@@ -1664,19 +1455,16 @@ protected bool moveInDirection(
             bool forceAction = false,
             bool manualInteract = false,
             HashSet<Collider> ignoreColliders = null
-        )
-        {
+        ) {
             Vector3 targetPosition = transform.position + direction;
             if (
                 checkIfSceneBoundsContainTargetPosition(targetPosition)
                 && CheckIfItemBlocksAgentMovement(direction, forceAction)
                 && // forceAction = true allows ignoring movement restrictions caused by held objects
                 CheckIfAgentCanMove(direction, ignoreColliders)
-            )
-            {
+            ) {
                 // only default hand if not manually interacting with things
-                if (!manualInteract)
-                {
+                if (!manualInteract) {
                     DefaultAgentHand();
                 }
 
@@ -1684,17 +1472,14 @@ protected bool moveInDirection(
                 transform.position = targetPosition;
                 this.snapAgentToGrid();
 
-                if (objectId != "" && maxDistanceToObject > 0.0f)
-                {
-                    if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-                    {
+                if (objectId != "" && maxDistanceToObject > 0.0f) {
+                    if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                         errorMessage = "No object with ID " + objectId;
                         transform.position = oldPosition;
                         return false;
                     }
                     SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
-                    if (distanceToObject(sop) > maxDistanceToObject)
-                    {
+                    if (distanceToObject(sop) > maxDistanceToObject) {
                         errorMessage =
                             "Agent movement would bring it beyond the max distance of " + objectId;
                         transform.position = oldPosition;
@@ -1702,23 +1487,18 @@ protected bool moveInDirection(
                     }
                 }
                 return true;
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
 
-        public void MoveGlobal(float x, float z)
-        {
+        public void MoveGlobal(float x, float z) {
             actionFinished(moveInDirection(direction: new Vector3(x, 0f, z)));
         }
 
-        protected float distanceToObject(SimObjPhysics sop)
-        {
+        protected float distanceToObject(SimObjPhysics sop) {
             float dist = 10000.0f;
-            foreach (Collider c in sop.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in sop.GetComponentsInChildren<Collider>()) {
                 Vector3 closestPoint = c.ClosestPointOnBounds(transform.position);
                 Vector3 p0 = new Vector3(transform.position.x, 0f, transform.position.z);
                 Vector3 p1 = new Vector3(closestPoint.x, 0f, closestPoint.z);
@@ -1727,8 +1507,7 @@ protected float distanceToObject(SimObjPhysics sop)
             return dist;
         }
 
-        public void DistanceToObject(string objectId)
-        {
+        public void DistanceToObject(string objectId) {
             float dist = distanceToObject(physicsSceneManager.ObjectIdToSimObjPhysics[objectId]);
 #if UNITY_EDITOR
             Debug.Log(dist);
@@ -1740,8 +1519,7 @@ public bool CheckIfAgentCanMove(
             Vector3 offset,
             HashSet<Collider> ignoreColliders = null,
             bool ignoreAgentColliders = true
-        )
-        {
+        ) {
             RaycastHit[] sweepResults = capsuleCastAllForAgent(
                 GetAgentCapsule(),
                 m_CharacterController.skinWidth,
@@ -1758,41 +1536,33 @@ public bool CheckIfAgentCanMove(
                 )
             );
 
-            if (ignoreColliders == null)
-            {
+            if (ignoreColliders == null) {
                 ignoreColliders = new HashSet<Collider>();
             }
 
             // Make sure to ignore all of the colliders of the agent itself
-            if (ignoreAgentColliders)
-            {
-                foreach (Collider c in GetComponentsInChildren<Collider>())
-                {
+            if (ignoreAgentColliders) {
+                foreach (Collider c in GetComponentsInChildren<Collider>()) {
                     ignoreColliders.Add(c);
                 }
             }
 
             // check if we hit an environmental structure or a sim object that we aren't actively holding. If so we can't move
-            if (sweepResults.Length > 0)
-            {
-                foreach (RaycastHit res in sweepResults)
-                {
-                    if (ignoreColliders != null && ignoreColliders.Contains(res.collider))
-                    {
+            if (sweepResults.Length > 0) {
+                foreach (RaycastHit res in sweepResults) {
+                    if (ignoreColliders != null && ignoreColliders.Contains(res.collider)) {
                         continue;
                     }
 
                     // Don't worry if we hit something thats in our hand.
-                    if (ItemInHand != null && ItemInHand.transform == res.transform)
-                    {
+                    if (ItemInHand != null && ItemInHand.transform == res.transform) {
                         continue;
                     }
 
                     if (
                         res.transform.gameObject != this.gameObject
                         && res.transform.GetComponent<BaseAgentComponent>()
-                    )
-                    {
+                    ) {
                         BaseAgentComponent maybeOtherAgent =
                             res.transform.GetComponent<BaseAgentComponent>();
                         int thisAgentNum = agentManager.agents.IndexOf(this);
@@ -1810,8 +1580,7 @@ public bool CheckIfAgentCanMove(
                             || res.transform.tag == "Structure"
                             || res.transform.tag == "Untagged"
                         )
-                    )
-                    {
+                    ) {
                         int thisAgentNum = agentManager.agents.IndexOf(this);
                         errorMessage =
                             $"{res.transform.name} is blocking Agent {thisAgentNum} from moving by {offset.ToString("F4")}.";
@@ -1825,33 +1594,25 @@ public bool CheckIfAgentCanMove(
 
         //TODO: May need to track enabled/disabled objecst separately since some
         //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
-        public void DisableObject(string objectId)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void DisableObject(string objectId) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 physicsSceneManager.ObjectIdToSimObjPhysics[objectId].gameObject.SetActive(false);
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
             }
         }
 
         //TODO: May need to track enabled/disabled objecst separately since some
         //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
-        public void DisableAllObjectsOfType(ServerAction action)
-        {
+        public void DisableAllObjectsOfType(ServerAction action) {
             string type = action.objectType;
-            if (type == "")
-            {
+            if (type == "") {
                 type = action.objectId;
             }
 
-            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
-                if (Enum.GetName(typeof(SimObjType), so.Type) == type)
-                {
+            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
+                if (Enum.GetName(typeof(SimObjType), so.Type) == type) {
                     so.gameObject.SetActive(false);
                 }
             }
@@ -1860,22 +1621,17 @@ public void DisableAllObjectsOfType(ServerAction action)
 
         //TODO: May need to track enabled/disabled objecst separately since some
         //actions loop through the ObjectIdTOSimObjPhysics dict and this may have adverse effects
-        public void EnableObject(string objectId)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void EnableObject(string objectId) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 physicsSceneManager.ObjectIdToSimObjPhysics[objectId].gameObject.SetActive(true);
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
             }
         }
 
         // remove a given sim object from the scene. Pass in the object's objectID string to remove it.
-        public void RemoveFromScene(string objectId)
-        {
+        public void RemoveFromScene(string objectId) {
             SimObjPhysics sop = getSimObjectFromId(objectId: objectId);
             Destroy(sop.transform.gameObject);
             physicsSceneManager.SetupScene(generateObjectIds: false);
@@ -1886,28 +1642,23 @@ public void RemoveFromScene(string objectId)
             message: "This action is deprecated. Call RemoveFromScene instead.",
             error: false
         )]
-        public void RemoveObjsFromScene(string[] objectIds)
-        {
+        public void RemoveObjsFromScene(string[] objectIds) {
             RemoveFromScene(objectIds: objectIds);
         }
 
         // remove a list of given sim object from the scene.
-        public void RemoveFromScene(string[] objectIds)
-        {
-            if (objectIds == null || objectIds.Length == 0)
-            {
+        public void RemoveFromScene(string[] objectIds) {
+            if (objectIds == null || objectIds.Length == 0) {
                 actionFinished(success: false, errorMessage: "objectIds must not be empty!");
             }
 
             // make sure all objectIds are valid before destorying any
             GameObject[] gameObjects = new GameObject[objectIds.Length];
-            for (int i = 0; i < objectIds.Length; i++)
-            {
+            for (int i = 0; i < objectIds.Length; i++) {
                 GameObject go = getSimObjectFromId(objectId: objectIds[i]).transform.gameObject;
                 gameObjects[i] = go;
             }
-            foreach (GameObject go in gameObjects)
-            {
+            foreach (GameObject go in gameObjects) {
                 Destroy(go);
             }
             physicsSceneManager.SetupScene(generateObjectIds: false);
@@ -1915,23 +1666,18 @@ public void RemoveFromScene(string[] objectIds)
         }
 
         // Sweeptest to see if the object Agent is holding will prohibit movement
-        public bool CheckIfItemBlocksAgentMovement(Vector3 offset, bool forceAction = false)
-        {
+        public bool CheckIfItemBlocksAgentMovement(Vector3 offset, bool forceAction = false) {
             bool result = false;
 
             // if forceAction true, ignore collision restrictions caused by held objects
-            if (forceAction)
-            {
+            if (forceAction) {
                 return true;
             }
             // if there is nothing in our hand, we are good, return!
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 //  Debug.Log("Agent has nothing in hand blocking movement");
                 return true;
-            }
-            else
-            {
+            } else {
                 // otherwise we are holding an object and need to do a sweep using that object's rb
 
                 Rigidbody rb = ItemInHand.GetComponent<Rigidbody>();
@@ -1941,18 +1687,13 @@ public bool CheckIfItemBlocksAgentMovement(Vector3 offset, bool forceAction = fa
                     offset.magnitude,
                     QueryTriggerInteraction.Ignore
                 );
-                if (sweepResults.Length > 0)
-                {
-                    foreach (RaycastHit res in sweepResults)
-                    {
+                if (sweepResults.Length > 0) {
+                    foreach (RaycastHit res in sweepResults) {
                         // did the item in the hand touch the agent? if so, ignore it's fine
-                        if (res.transform.tag == "Player")
-                        {
+                        if (res.transform.tag == "Player") {
                             result = true;
                             break;
-                        }
-                        else
-                        {
+                        } else {
                             errorMessage =
                                 $"{res.transform.name} is blocking the Agent from moving by {offset.ToString("F4")} with {ItemInHand.name}";
                             result = false;
@@ -1961,8 +1702,7 @@ public bool CheckIfItemBlocksAgentMovement(Vector3 offset, bool forceAction = fa
                     }
                 }
                 // if the array is empty, nothing was hit by the sweeptest so we are clear to move
-                else
-                {
+                else {
                     // Debug.Log("Agent Body can move " + orientation);
                     result = true;
                 }
@@ -1971,16 +1711,12 @@ public bool CheckIfItemBlocksAgentMovement(Vector3 offset, bool forceAction = fa
             }
         }
 
-        protected bool checkIfSceneBoundsContainTargetPosition(Vector3 position)
-        {
-            if (!agentManager.SceneBounds.Contains(position))
-            {
+        protected bool checkIfSceneBoundsContainTargetPosition(Vector3 position) {
+            if (!agentManager.SceneBounds.Contains(position)) {
                 errorMessage = "Scene bounds do not contain target position: " + position;
                 return false;
-            }
-            else
-            {
-                return true;
+            } else {
+                return true;
             }
         }
 
@@ -1988,20 +1724,16 @@ protected bool checkIfSceneBoundsContainTargetPosition(Vector3 position)
         // during initialization and reduces the chance of an object held by the
         // arm from moving a large mass object.  This also eliminates the chance
         // of a large mass object moving vs. relying on the CollisionListener to prevent it.
-        public void MakeObjectsStaticKinematicMassThreshold()
-        {
-            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+        public void MakeObjectsStaticKinematicMassThreshold() {
+            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 // check if the sopType is something that can be hung
                 if (
                     sop.Type == SimObjType.Towel
                     || sop.Type == SimObjType.HandTowel
                     || sop.Type == SimObjType.ToiletPaper
-                )
-                {
+                ) {
                     // if this object is actively hung on its corresponding object specific receptacle... skip it so it doesn't fall on the floor
-                    if (sop.GetComponentInParent<ObjectSpecificReceptacle>())
-                    {
+                    if (sop.GetComponentInParent<ObjectSpecificReceptacle>()) {
                         continue;
                     }
                 }
@@ -2009,8 +1741,7 @@ public void MakeObjectsStaticKinematicMassThreshold()
                 if (
                     CollisionListener.useMassThreshold
                     && sop.Mass > CollisionListener.massThreshold
-                )
-                {
+                ) {
                     Rigidbody rb = sop.GetComponent<Rigidbody>();
                     rb.isKinematic = true;
                     sop.PrimaryProperty = SimObjPrimaryProperty.Static;
@@ -2025,16 +1756,13 @@ public void MakeObjectsStaticKinematicMassThreshold()
         // use this by initializing the scene, then calling randomize if desired, and then call this action to prepare the scene so all objects will react to others upon collision.
         // note that SOMETIMES rigidbodies will continue to jitter or wiggle, especially if they are stacked against other rigidbodies.
         // this means that the isSceneAtRest bool will always be false
-        public void MakeAllObjectsMoveable()
-        {
+        public void MakeAllObjectsMoveable() {
             physicsSceneManager.MakeAllObjectsMoveable();
             actionFinished(true);
         }
 
-        public void MakeAllObjectsStationary()
-        {
-            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+        public void MakeAllObjectsStationary() {
+            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 Rigidbody rb = sop.GetComponent<Rigidbody>();
                 rb.isKinematic = true;
 
@@ -2049,25 +1777,21 @@ public void MakeAllObjectsStationary()
 
         // this does not appear to be used except for by the python unit test?
         // May deprecate this at some point?
-        public void RotateLook(ServerAction response)
-        {
+        public void RotateLook(ServerAction response) {
             transform.rotation = Quaternion.Euler(new Vector3(0.0f, response.rotation.y, 0.0f));
             m_Camera.transform.localEulerAngles = new Vector3(response.horizon, 0.0f, 0.0f);
             actionFinished(true);
         }
 
         // rotate view with respect to mouse or server controls - I'm not sure when this is actually used
-        protected virtual void RotateView()
-        {
+        protected virtual void RotateView() {
             // turn up & down
-            if (Mathf.Abs(m_XRotation) > Mathf.Epsilon)
-            {
+            if (Mathf.Abs(m_XRotation) > Mathf.Epsilon) {
                 transform.Rotate(Vector3.right * m_XRotation, Space.Self);
             }
 
             // turn left & right
-            if (Mathf.Abs(m_ZRotation) > Mathf.Epsilon)
-            {
+            if (Mathf.Abs(m_ZRotation) > Mathf.Epsilon) {
                 transform.Rotate(Vector3.up * m_ZRotation, Space.Self);
             }
 
@@ -2081,12 +1805,9 @@ protected virtual void RotateView()
             // move this out of Unity
             // constrain vertical turns in safe range
             float X_SAFE_RANGE = 30.0f;
-            if (eulerX < 180.0f)
-            {
+            if (eulerX < 180.0f) {
                 eulerX = Mathf.Min(X_SAFE_RANGE, eulerX);
-            }
-            else
-            {
+            } else {
                 eulerX = 360.0f - Mathf.Min(X_SAFE_RANGE, 360.0f - eulerX);
             }
 
@@ -2111,12 +1832,9 @@ private protected IEnumerator openAnimation(
             bool freezeContained = false,
             GameObject posRotManip = null,
             GameObject posRotRef = null
-        )
-        {
-            if (openableObject == null)
-            {
-                if (markActionFinished)
-                {
+        ) {
+            if (openableObject == null) {
+                if (markActionFinished) {
                     errorMessage = "Must pass in openable object!";
                     actionFinished(false);
                 }
@@ -2125,13 +1843,11 @@ private protected IEnumerator openAnimation(
 
             // stores the object id of each object within this openableObject
             Dictionary<string, Transform> objectIdToOldParent = null;
-            if (freezeContained)
-            {
+            if (freezeContained) {
                 SimObjPhysics target = ancestorSimObjPhysics(openableObject.gameObject);
                 objectIdToOldParent = new Dictionary<string, Transform>();
 
-                foreach (string objectId in target.GetAllSimObjectsInReceptacleTriggersByObjectID())
-                {
+                foreach (string objectId in target.GetAllSimObjectsInReceptacleTriggersByObjectID()) {
                     SimObjPhysics toReParent = physicsSceneManager.ObjectIdToSimObjPhysics[
                         objectId
                     ];
@@ -2164,8 +1880,7 @@ private protected IEnumerator openAnimation(
             bool succeeded = true;
 
             // if failure occurred, revert back to backup state (either start or lastSuccessful), and then report failure
-            if (openableObject.GetFailState() != CanOpen_Object.failState.none)
-            {
+            if (openableObject.GetFailState() != CanOpen_Object.failState.none) {
                 succeeded = false;
 
                 openableObject.SetIsCurrentlyLerping(true);
@@ -2180,23 +1895,18 @@ private protected IEnumerator openAnimation(
                 );
                 yield return new WaitUntil(() => (openableObject.GetIsCurrentlyLerping() == false));
                 yield return null;
-                if (openableObject.GetFailState() == CanOpen_Object.failState.collision)
-                {
+                if (openableObject.GetFailState() == CanOpen_Object.failState.collision) {
                     errorMessage =
                         "Openable object collided with "
                         + openableObject.GetFailureCollision().name;
-                }
-                else if (openableObject.GetFailState() == CanOpen_Object.failState.hyperextension)
-                {
+                } else if (openableObject.GetFailState() == CanOpen_Object.failState.hyperextension) {
                     errorMessage = "Agent hyperextended arm while opening object";
                 }
             }
 
             // stops any object located within this openableObject from moving
-            if (freezeContained)
-            {
-                foreach (string objectId in objectIdToOldParent.Keys)
-                {
+            if (freezeContained) {
+                foreach (string objectId in objectIdToOldParent.Keys) {
                     SimObjPhysics toReParent = physicsSceneManager.ObjectIdToSimObjPhysics[
                         objectId
                     ];
@@ -2217,13 +1927,11 @@ private protected IEnumerator openAnimation(
             openableObject.SetStopAtNonStaticCol(false);
 
             // Remove PosRotRef from MovingPart
-            if (posRotRef != null)
-            {
+            if (posRotRef != null) {
                 UnityEngine.Object.Destroy(posRotRef);
             }
 
-            if (markActionFinished)
-            {
+            if (markActionFinished) {
                 actionFinished(succeeded);
             }
         }
@@ -2241,50 +1949,40 @@ protected void openObject(
             float? physicsInterval = null,
             bool simplifyPhysics = false,
             float? moveMagnitude = null // moveMagnitude is supported for backwards compatibility. It's new name is 'openness'.
-        )
-        {
+        ) {
             // backwards compatibility support
-            if (moveMagnitude != null)
-            {
+            if (moveMagnitude != null) {
                 // Previously, when moveMagnitude==0, that meant full openness, since the default float was 0.
                 openness = ((float)moveMagnitude) == 0 ? 1 : (float)moveMagnitude;
             }
 
-            if (openness > 1 || openness < 0)
-            {
+            if (openness > 1 || openness < 0) {
                 errorMessage = "openness must be in [0:1]";
-                if (markActionFinished)
-                {
+                if (markActionFinished) {
                     actionFinished(false);
                 }
                 return;
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage = "Object not found!";
-                if (markActionFinished)
-                {
+                if (markActionFinished) {
                     actionFinished(false);
                 }
                 return;
             }
 
-            if (!forceAction && !IsInteractable(target))
-            {
+            if (!forceAction && !IsInteractable(target)) {
                 errorMessage = "object is visible but occluded by something: " + target.ObjectID;
-                if (markActionFinished)
-                {
+                if (markActionFinished) {
                     actionFinished(false);
                 }
                 return;
             }
 
-            if (!target.GetComponent<CanOpen_Object>())
-            {
+            if (!target.GetComponent<CanOpen_Object>()) {
                 errorMessage = $"{target.ObjectID} is not an Openable object";
-                if (markActionFinished)
-                {
+                if (markActionFinished) {
                     actionFinished(false);
                 }
                 return;
@@ -2297,36 +1995,29 @@ protected void openObject(
             if (
                 codd.WhatReceptaclesMustBeOffToOpen().Contains(target.Type)
                 && target.GetComponent<CanToggleOnOff>().isOn
-            )
-            {
+            ) {
                 errorMessage = "Target must be OFF to open!";
-                if (markActionFinished)
-                {
+                if (markActionFinished) {
                     actionFinished(false);
                 }
                 return;
             }
 
-            if (useGripper == true)
-            {
+            if (useGripper == true) {
                 // Opening objects with the gripper only works with the IK-Arm
                 // (it'd be preferable to reference the agentMode directly, but no such universal metadata exists)
-                if (this.GetComponent<BaseAgentComponent>().IKArm.activeInHierarchy == false)
-                {
+                if (this.GetComponent<BaseAgentComponent>().IKArm.activeInHierarchy == false) {
                     errorMessage = "IK-Arm is required to open objects with gripper";
-                    if (markActionFinished)
-                    {
+                    if (markActionFinished) {
                         actionFinished(false);
                     }
                     return;
                 }
 
                 // Opening objects with the gripper only works with an empty hand
-                if (ItemInHand != null)
-                {
+                if (ItemInHand != null) {
                     errorMessage = "An empty hand is required to open objects with gripper";
-                    if (markActionFinished)
-                    {
+                    if (markActionFinished) {
                         actionFinished(false);
                     }
                     return;
@@ -2334,12 +2025,10 @@ protected void openObject(
 
                 // Opening objects with the gripper currently requires the gripper-sphere to have some overlap with the moving parts' collision geometry
                 GameObject parentMovingPart = FindOverlappingMovingPart(codd);
-                if (parentMovingPart == null)
-                {
+                if (parentMovingPart == null) {
                     errorMessage =
                         "Gripper must be making contact with at least one moving part's surface to open it!";
-                    if (markActionFinished)
-                    {
+                    if (markActionFinished) {
                         actionFinished(false);
                     }
                     return;
@@ -2388,8 +2077,7 @@ protected void openObject(
         }
 
         //helper action to set the openness of a "rotate" typed open/close object immediately (no tween over time)
-        public void OpenObjectImmediate(string objectId, float openness = 1.0f)
-        {
+        public void OpenObjectImmediate(string objectId, float openness = 1.0f) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
@@ -2400,16 +2088,13 @@ public void OpenObjectImmediate(string objectId, float openness = 1.0f)
 
         //helper function to confirm if GripperSphere overlaps with openable object's moving part(s), and which one
 
-        public GameObject FindOverlappingMovingPart(CanOpen_Object codd)
-        {
+        public GameObject FindOverlappingMovingPart(CanOpen_Object codd) {
             int layerMask = 1 << 8;
             GameObject magnetSphere = this.GetComponent<BaseAgentComponent>()
                 .IKArm.GetComponent<IK_Robot_Arm_Controller>()
                 .GetMagnetSphere();
-            foreach (GameObject movingPart in codd.GetComponent<CanOpen_Object>().MovingParts)
-            {
-                foreach (Collider col in movingPart.GetComponentsInChildren<Collider>())
-                {
+            foreach (GameObject movingPart in codd.GetComponent<CanOpen_Object>().MovingParts) {
+                foreach (Collider col in movingPart.GetComponentsInChildren<Collider>()) {
                     // Checking for matches between moving parts' colliders and colliders inside of gripper-sphere
                     foreach (
                         Collider containedCol in Physics.OverlapSphere(
@@ -2419,10 +2104,8 @@ Collider containedCol in Physics.OverlapSphere(
                             magnetSphere.transform.GetComponent<SphereCollider>().radius,
                             layerMask
                         )
-                    )
-                    {
-                        if (col == containedCol)
-                        {
+                    ) {
+                        if (col == containedCol) {
                             return movingPart;
                         }
                     }
@@ -2441,8 +2124,7 @@ public void OpenObject(
             float? physicsInterval = null,
             bool useGripper = false,
             float? moveMagnitude = null // moveMagnitude is supported for backwards compatibility. Its new name is 'openness'.
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: forceAction
@@ -2467,8 +2149,7 @@ public void OpenObject(
             bool forceAction = false,
             float openness = 1,
             float? moveMagnitude = null // moveMagnitude is supported for backwards compatibility. It's new name is 'openness'.
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromXY(
                 x: x,
                 y: y,
@@ -2483,16 +2164,14 @@ public void OpenObject(
             );
         }
 
-        public void PhysicsSyncTransforms()
-        {
+        public void PhysicsSyncTransforms() {
             Physics.SyncTransforms();
             actionFinished(true);
         }
 
         // pause physics autosimulation! Automatic physics simulation can be resumed using the UnpausePhysicsAutoSim() action.
         // additionally, auto simulation will automatically resume from the LateUpdate() check on AgentManager.cs - if the scene has come to rest, physics autosimulation will resume
-        public void PausePhysicsAutoSim()
-        {
+        public void PausePhysicsAutoSim() {
             physicsSceneManager.PausePhysicsAutoSim();
             actionFinished(true);
         }
@@ -2502,10 +2181,8 @@ public void AdvancePhysicsStep(
             float timeStep = 0.02f,
             float? simSeconds = null,
             bool allowAutoSimulation = false
-        )
-        {
-            if ((!allowAutoSimulation) && Physics.autoSimulation)
-            {
+        ) {
+            if ((!allowAutoSimulation) && Physics.autoSimulation) {
                 errorMessage = (
                     "AdvancePhysicsStep can only be called if Physics AutoSimulation is currently "
                     + "paused or if you have passed allowAutoSimulation=true! Either use the"
@@ -2516,20 +2193,17 @@ public void AdvancePhysicsStep(
                 return;
             }
 
-            if (timeStep <= 0.0f || timeStep > 0.05f)
-            {
+            if (timeStep <= 0.0f || timeStep > 0.05f) {
                 errorMessage =
                     "Please use a timeStep between 0.0f and 0.05f. Larger timeSteps produce inconsistent simulation results.";
                 actionFinished(false);
                 return;
             }
 
-            if (!simSeconds.HasValue)
-            {
+            if (!simSeconds.HasValue) {
                 simSeconds = timeStep;
             }
-            if (simSeconds.Value < 0.0f)
-            {
+            if (simSeconds.Value < 0.0f) {
                 errorMessage = $"simSeconds must be non-negative (simSeconds=={simSeconds}).";
                 actionFinished(false);
                 return;
@@ -2540,22 +2214,18 @@ public void AdvancePhysicsStep(
         }
 
         // Use this to immediately unpause physics autosimulation and allow physics to resolve automatically like normal
-        public void UnpausePhysicsAutoSim()
-        {
+        public void UnpausePhysicsAutoSim() {
             physicsSceneManager.UnpausePhysicsAutoSim();
             actionFinished(true);
         }
 
         // Check if agent is collided with other objects
-        protected bool IsCollided()
-        {
+        protected bool IsCollided() {
             return collisionsInAction.Count > 0;
         }
 
-        public bool IsInteractable(SimObjPhysics sop)
-        {
-            if (sop == null)
-            {
+        public bool IsInteractable(SimObjPhysics sop) {
+            if (sop == null) {
                 throw new NullReferenceException("null SimObjPhysics passed to IsInteractable");
             }
 
@@ -2566,28 +2236,23 @@ public bool IsInteractable(SimObjPhysics sop)
                 ).Length == 1;
         }
 
-        public virtual SimpleSimObj[] allSceneObjects()
-        {
+        public virtual SimpleSimObj[] allSceneObjects() {
             return GameObject.FindObjectsOfType<SimObj>();
         }
 
-        public void ResetObjectFilter()
-        {
+        public void ResetObjectFilter() {
             this.simObjFilter = null;
             // The result of this action should return all the objects. Thus we should NOT
             // make this return a `actionFinishedEmit`
             actionFinished(true);
         }
 
-        public void SetObjectFilter(string[] objectIds)
-        {
+        public void SetObjectFilter(string[] objectIds) {
             SimObjPhysics[] simObjects = GameObject.FindObjectsOfType<SimObjPhysics>();
             HashSet<SimObjPhysics> filter = new HashSet<SimObjPhysics>();
             HashSet<string> filterObjectIds = new HashSet<string>(objectIds);
-            foreach (var simObj in simObjects)
-            {
-                if (filterObjectIds.Contains(simObj.ObjectID))
-                {
+            foreach (var simObj in simObjects) {
+                if (filterObjectIds.Contains(simObj.ObjectID)) {
                     filter.Add(simObj);
                 }
             }
@@ -2597,15 +2262,12 @@ public void SetObjectFilter(string[] objectIds)
             actionFinishedEmit(true);
         }
 
-        public void SetObjectFilterForType(string[] objectTypes)
-        {
+        public void SetObjectFilterForType(string[] objectTypes) {
             SimObjPhysics[] simObjects = GameObject.FindObjectsOfType<SimObjPhysics>();
             HashSet<SimObjPhysics> filter = new HashSet<SimObjPhysics>();
             HashSet<string> filterObjectTypes = new HashSet<string>(objectTypes);
-            foreach (var simObj in simObjects)
-            {
-                if (filterObjectTypes.Contains(Enum.GetName(typeof(SimObjType), simObj.Type)))
-                {
+            foreach (var simObj in simObjects) {
+                if (filterObjectTypes.Contains(Enum.GetName(typeof(SimObjType), simObj.Type))) {
                     filter.Add(simObj);
                 }
             }
@@ -2615,15 +2277,12 @@ public void SetObjectFilterForType(string[] objectTypes)
             actionFinishedEmit(true);
         }
 
-        public ObjectMetadata setReceptacleMetadata(ObjectMetadata meta)
-        {
+        public ObjectMetadata setReceptacleMetadata(ObjectMetadata meta) {
             return meta;
         }
 
-        public virtual ObjectMetadata[] generateObjectMetadata(SimObjPhysics[] simObjects)
-        {
-            if (simObjects == null)
-            {
+        public virtual ObjectMetadata[] generateObjectMetadata(SimObjPhysics[] simObjects) {
+            if (simObjects == null) {
                 throw new NullReferenceException(
                     "null SimObjPhysics passed to generateObjectMetadata"
                 );
@@ -2653,39 +2312,32 @@ public virtual ObjectMetadata[] generateObjectMetadata(SimObjPhysics[] simObject
             gizmobounds.Clear();
 #endif
 
-            for (int k = 0; k < numObj; k++)
-            {
+            for (int k = 0; k < numObj; k++) {
                 SimObjPhysics simObj = simObjects[k];
                 ObjectMetadata meta = SimObjPhysics.ObjectMetadataFromSimObjPhysics(
                     simObj,
                     visibleSimObjsHash.Contains(simObj),
                     interactableSimObjsHash.Contains(simObj)
                 );
-                if (meta.toggleable)
-                {
+                if (meta.toggleable) {
                     SimObjPhysics[] controlled = simObj
                         .GetComponent<CanToggleOnOff>()
                         .ReturnControlledSimObjects();
                     List<string> controlledList = new List<string>();
-                    foreach (SimObjPhysics csop in controlled)
-                    {
+                    foreach (SimObjPhysics csop in controlled) {
                         controlledList.Add(csop.objectID);
                     }
                     meta.controlledObjects = controlledList.ToArray();
                 }
-                if (meta.receptacle)
-                {
+                if (meta.receptacle) {
                     List<string> containedObjectsAsID = new List<String>();
-                    foreach (GameObject go in simObj.ContainedGameObjects())
-                    {
+                    foreach (GameObject go in simObj.ContainedGameObjects()) {
                         containedObjectsAsID.Add(go.GetComponent<SimObjPhysics>().ObjectID);
                     }
                     List<string> roid = containedObjectsAsID; // simObj.Contains();
 
-                    foreach (string oid in roid)
-                    {
-                        if (!parentReceptacles.ContainsKey(oid))
-                        {
+                    foreach (string oid in roid) {
+                        if (!parentReceptacles.ContainsKey(oid)) {
                             parentReceptacles[oid] = new List<string>();
                         }
                         parentReceptacles[oid].Add(simObj.ObjectID);
@@ -2698,10 +2350,8 @@ public virtual ObjectMetadata[] generateObjectMetadata(SimObjPhysics[] simObject
                 );
                 metadata.Add(meta);
             }
-            foreach (ObjectMetadata meta in metadata)
-            {
-                if (parentReceptacles.ContainsKey(meta.objectId))
-                {
+            foreach (ObjectMetadata meta in metadata) {
+                if (parentReceptacles.ContainsKey(meta.objectId)) {
                     meta.parentReceptacles = parentReceptacles[meta.objectId].ToArray();
                 }
             }
@@ -2713,8 +2363,7 @@ public virtual ObjectMetadata ObjectMetadataFromSimObjPhysics(
             SimObjPhysics simObj,
             bool isVisible,
             bool isInteractable
-        )
-        {
+        ) {
             ObjectMetadata objMeta = new ObjectMetadata();
             GameObject o = simObj.gameObject;
             objMeta.name = o.name;
@@ -2724,8 +2373,7 @@ bool isInteractable
             objMeta.receptacle = simObj.IsReceptacle;
 
             objMeta.openable = simObj.IsOpenable;
-            if (objMeta.openable)
-            {
+            if (objMeta.openable) {
                 objMeta.isOpen = simObj.IsOpen;
                 objMeta.openness = simObj.openness;
             }
@@ -2738,33 +2386,28 @@ bool isInteractable
                 simObj.DoesThisObjectHaveThisSecondaryProperty(
                     SimObjSecondaryProperty.CanToggleOnOff
                 )
-            )
-            {
+            ) {
                 objMeta.isToggled = simObj.IsToggled;
             }
 
             objMeta.breakable = simObj.IsBreakable;
-            if (objMeta.breakable)
-            {
+            if (objMeta.breakable) {
                 objMeta.isBroken = simObj.IsBroken;
             }
 
             objMeta.canFillWithLiquid = simObj.IsFillable;
-            if (objMeta.canFillWithLiquid)
-            {
+            if (objMeta.canFillWithLiquid) {
                 objMeta.isFilledWithLiquid = simObj.IsFilled;
                 objMeta.fillLiquid = simObj.FillLiquid;
             }
 
             objMeta.dirtyable = simObj.IsDirtyable;
-            if (objMeta.dirtyable)
-            {
+            if (objMeta.dirtyable) {
                 objMeta.isDirty = simObj.IsDirty;
             }
 
             objMeta.cookable = simObj.IsCookable;
-            if (objMeta.cookable)
-            {
+            if (objMeta.cookable) {
                 objMeta.isCooked = simObj.IsCooked;
             }
 
@@ -2773,14 +2416,12 @@ bool isInteractable
                 simObj.IsPickupable
                 || simObj.IsMoveable
                 || (simObj.salientMaterials != null && simObj.salientMaterials.Length > 0)
-            )
-            {
+            ) {
                 // this object should report back mass and salient materials
 
                 string[] salientMaterialsToString = new string[simObj.salientMaterials.Length];
 
-                for (int i = 0; i < simObj.salientMaterials.Length; i++)
-                {
+                for (int i = 0; i < simObj.salientMaterials.Length; i++) {
                     salientMaterialsToString[i] = simObj.salientMaterials[i].ToString();
                 }
 
@@ -2803,14 +2444,12 @@ bool isInteractable
             // }
 
             objMeta.sliceable = simObj.IsSliceable;
-            if (objMeta.sliceable)
-            {
+            if (objMeta.sliceable) {
                 objMeta.isSliced = simObj.IsSliced;
             }
 
             objMeta.canBeUsedUp = simObj.CanBeUsedUp;
-            if (objMeta.canBeUsedUp)
-            {
+            if (objMeta.canBeUsedUp) {
                 objMeta.isUsedUp = simObj.IsUsedUp;
             }
 
@@ -2845,10 +2484,8 @@ bool isInteractable
 
         public virtual MinimalObjectMetadata[] generateMinimalObjectMetadata(
             SimObjPhysics[] simObjects
-        )
-        {
-            if (simObjects == null)
-            {
+        ) {
+            if (simObjects == null) {
                 throw new NullReferenceException(
                     "null SimObjPhysics passed to generateObjectMetadata"
                 );
@@ -2857,8 +2494,7 @@ SimObjPhysics[] simObjects
             int numObj = simObjects.Length;
             List<MinimalObjectMetadata> metadata = new List<MinimalObjectMetadata>();
 
-            for (int k = 0; k < numObj; k++)
-            {
+            for (int k = 0; k < numObj; k++) {
                 SimObjPhysics simObj = simObjects[k];
 
                 MinimalObjectMetadata objMeta = new MinimalObjectMetadata();
@@ -2875,23 +2511,15 @@ SimObjPhysics[] simObjects
             return metadata.ToArray();
         }
 
-        public void GetMinimalObjectMetadata(List<string> objectIds = null)
-        {
+        public void GetMinimalObjectMetadata(List<string> objectIds = null) {
             List<SimObjPhysics> sops = new List<SimObjPhysics>();
-            if (objectIds == null)
-            {
+            if (objectIds == null) {
                 sops = physicsSceneManager.ObjectIdToSimObjPhysics.Values.ToList();
-            }
-            else
-            {
-                foreach (string objectId in objectIds)
-                {
-                    if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-                    {
+            } else {
+                foreach (string objectId in objectIds) {
+                    if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                         sops.Add(physicsSceneManager.ObjectIdToSimObjPhysics[objectId]);
-                    }
-                    else
-                    {
+                    } else {
                         Debug.Log($"Object ID {objectId} not found in scene.");
                         continue;
                     }
@@ -2902,23 +2530,15 @@ public void GetMinimalObjectMetadata(List<string> objectIds = null)
             actionFinishedEmit(true, objectMetadata);
         }
 
-        public void GetObjectMetadata(List<string> objectIds = null)
-        {
+        public void GetObjectMetadata(List<string> objectIds = null) {
             List<SimObjPhysics> sops = new List<SimObjPhysics>();
-            if (objectIds == null)
-            {
+            if (objectIds == null) {
                 sops = physicsSceneManager.ObjectIdToSimObjPhysics.Values.ToList();
-            }
-            else
-            {
-                foreach (string objectId in objectIds)
-                {
-                    if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-                    {
+            } else {
+                foreach (string objectId in objectIds) {
+                    if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                         sops.Add(physicsSceneManager.ObjectIdToSimObjPhysics[objectId]);
-                    }
-                    else
-                    {
+                    } else {
                         Debug.Log($"Object ID {objectId} not found in scene.");
                         continue;
                     }
@@ -2929,8 +2549,7 @@ public void GetObjectMetadata(List<string> objectIds = null)
             actionFinishedEmit(true, objectMetadata);
         }
 
-        public SceneBounds GenerateSceneBounds(Bounds bounding)
-        {
+        public SceneBounds GenerateSceneBounds(Bounds bounding) {
             SceneBounds b = new SceneBounds();
             List<float[]> cornerPoints = new List<float[]>();
             float[] xs = new float[]
@@ -2948,12 +2567,9 @@ public SceneBounds GenerateSceneBounds(Bounds bounding)
                 bounding.center.z + bounding.size.z / 2f,
                 bounding.center.z - bounding.size.z / 2f
             };
-            foreach (float x in xs)
-            {
-                foreach (float y in ys)
-                {
-                    foreach (float z in zs)
-                    {
+            foreach (float x in xs) {
+                foreach (float y in ys) {
+                    foreach (float z in zs) {
                         cornerPoints.Add(new float[] { x, y, z });
                     }
                 }
@@ -2966,22 +2582,19 @@ public SceneBounds GenerateSceneBounds(Bounds bounding)
             return b;
         }
 
-        public virtual MetadataPatch generateMetadataPatch()
-        {
+        public virtual MetadataPatch generateMetadataPatch() {
             MetadataPatch patch = new MetadataPatch();
             patch.lastAction = this.lastAction;
             patch.lastActionSuccess = this.lastActionSuccess;
             patch.actionReturn = this.actionReturn;
-            if (errorCode != ServerActionErrorCode.Undefined)
-            {
+            if (errorCode != ServerActionErrorCode.Undefined) {
                 patch.errorCode = Enum.GetName(typeof(ServerActionErrorCode), errorCode);
             }
             patch.errorMessage = this.errorMessage;
             return patch;
         }
 
-        public virtual MetadataWrapper generateMetadataWrapper()
-        {
+        public virtual MetadataWrapper generateMetadataWrapper() {
             // AGENT METADATA
             AgentMetadata agentMeta = new AgentMetadata();
             agentMeta.name = "agent";
@@ -3042,15 +2655,13 @@ public virtual MetadataWrapper generateMetadataWrapper()
             metaMessage.errorMessage = errorMessage;
             metaMessage.actionReturn = this.actionReturn;
 
-            if (errorCode != ServerActionErrorCode.Undefined)
-            {
+            if (errorCode != ServerActionErrorCode.Undefined) {
                 metaMessage.errorCode = Enum.GetName(typeof(ServerActionErrorCode), errorCode);
             }
 
             List<InventoryObject> ios = new List<InventoryObject>();
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 SimObjPhysics so = ItemInHand.GetComponent<SimObjPhysics>();
                 InventoryObject io = new InventoryObject();
                 io.objectId = so.ObjectID;
@@ -3070,16 +2681,11 @@ public virtual MetadataWrapper generateMetadataWrapper()
 
             // TODO: remove from base.
             // ARM
-            if (Arm != null)
-            {
+            if (Arm != null) {
                 metaMessage.arm = Arm.GenerateMetadata();
-            }
-            else if (SArm != null)
-            {
+            } else if (SArm != null) {
                 metaMessage.arm = SArm.GenerateMetadata();
-            }
-            else if (AArm != null)
-            {
+            } else if (AArm != null) {
                 metaMessage.articulationArm = AArm.GenerateArticulationMetadata();
             }
 
@@ -3096,8 +2702,7 @@ public virtual MetadataWrapper generateMetadataWrapper()
             metaMessage.actionStringsReturn = actionStringsReturn;
             metaMessage.actionVector3sReturn = actionVector3sReturn;
 
-            if (alwaysReturnVisibleRange)
-            {
+            if (alwaysReturnVisibleRange) {
                 metaMessage.visibleRange = visibleRange();
             }
 
@@ -3120,10 +2725,8 @@ public virtual MetadataWrapper generateMetadataWrapper()
             return metaMessage;
         }
 
-        public virtual void updateImageSynthesis(bool status)
-        {
-            if (this.imageSynthesis == null)
-            {
+        public virtual void updateImageSynthesis(bool status) {
+            if (this.imageSynthesis == null) {
                 imageSynthesis =
                     this.m_Camera.gameObject.GetComponent<ImageSynthesis>() as ImageSynthesis;
             }
@@ -3133,8 +2736,7 @@ public virtual void updateImageSynthesis(bool status)
         // This should only be used by DebugInputField and HideNSeekController
         // Once all those invocations have been converted to Dictionary<string, object>
         // this can be removed
-        public void ProcessControlCommand(ServerAction serverAction)
-        {
+        public void ProcessControlCommand(ServerAction serverAction) {
             lastActionInitialPhysicsSimulateCount = PhysicsSceneManager.PhysicsSimulateCallCount;
             errorMessage = "";
             errorCode = ServerActionErrorCode.Undefined;
@@ -3150,22 +2752,16 @@ public void ProcessControlCommand(ServerAction serverAction)
             System.Reflection.MethodInfo method = this.GetType().GetMethod(serverAction.action);
 
             this.agentState = AgentState.Processing;
-            try
-            {
-                if (method == null)
-                {
+            try {
+                if (method == null) {
                     errorMessage = "Invalid action: " + serverAction.action;
                     errorCode = ServerActionErrorCode.InvalidAction;
                     Debug.LogError(errorMessage);
                     actionFinished(false);
-                }
-                else
-                {
+                } else {
                     method.Invoke(this, new object[] { serverAction });
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.LogError("Caught error with invoke for action: " + serverAction.action);
                 Debug.LogError("Action error message: " + errorMessage);
                 Debug.LogError(e);
@@ -3178,19 +2774,16 @@ public void ProcessControlCommand(ServerAction serverAction)
         // the parameter name is different to avoid failing a test
         // that looks for methods with identical param names, since
         // we dispatch using method + param names
-        public void ProcessControlCommand(Dictionary<string, object> actionDict)
-        {
+        public void ProcessControlCommand(Dictionary<string, object> actionDict) {
             ProcessControlCommand(new DynamicServerAction(actionDict));
         }
 
-        public void ProcessControlCommand(DynamicServerAction controlCommand)
-        {
+        public void ProcessControlCommand(DynamicServerAction controlCommand) {
             ProcessControlCommand(controlCommand: controlCommand, target: this);
         }
 
         public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T target)
-            where T : ActionInvokable
-        {
+            where T : ActionInvokable {
             lastActionInitialPhysicsSimulateCount = PhysicsSceneManager.PhysicsSimulateCallCount;
             errorMessage = "";
             errorCode = ServerActionErrorCode.Undefined;
@@ -3205,13 +2798,10 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
             );
             this.agentState = AgentState.Processing;
 
-            try
-            {
+            try {
                 // Debug.Log("Calling dispatch");
                 ActionDispatcher.Dispatch(target: target, dynamicServerAction: controlCommand);
-            }
-            catch (InvalidArgumentsException e)
-            {
+            } catch (InvalidArgumentsException e) {
                 errorMessage =
                     $"\n\tAction: \"{controlCommand.action}\" called with invalid argument{(e.InvalidArgumentNames.Count() > 1 ? "s" : "")}: {string.Join(", ", e.InvalidArgumentNames.Select(name => $"'{name}'").ToArray())}"
                     + $"\n\tExpected arguments: {string.Join(", ", e.ParameterNames)}"
@@ -3224,9 +2814,7 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
                     controlCommand
                 );
                 actionFinished(false);
-            }
-            catch (ToObjectArgumentActionException e)
-            {
+            } catch (ToObjectArgumentActionException e) {
                 Dictionary<string, string> typeMap = new Dictionary<string, string>
                 {
                     { "Single", "float" },
@@ -3237,8 +2825,7 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
                 };
                 Type underlingType = Nullable.GetUnderlyingType(e.parameterType);
                 string typeName = underlingType == null ? e.parameterType.Name : underlingType.Name;
-                if (typeMap.ContainsKey(typeName))
-                {
+                if (typeMap.ContainsKey(typeName)) {
                     typeName = typeMap[typeName];
                 }
                 errorMessage =
@@ -3246,9 +2833,7 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
                     + $" Cannot convert to: {typeName}";
                 errorCode = ServerActionErrorCode.InvalidArgument;
                 actionFinished(false);
-            }
-            catch (MissingArgumentsActionException e)
-            {
+            } catch (MissingArgumentsActionException e) {
                 errorMessage =
                     "action: "
                     + controlCommand.action
@@ -3256,23 +2841,17 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
                     + string.Join(",", e.ArgumentNames.ToArray());
                 errorCode = ServerActionErrorCode.MissingArguments;
                 actionFinished(false);
-            }
-            catch (AmbiguousActionException e)
-            {
+            } catch (AmbiguousActionException e) {
                 errorMessage = "Ambiguous action: " + controlCommand.action + " " + e.Message;
                 errorCode = ServerActionErrorCode.AmbiguousAction;
                 actionFinished(false);
-            }
-            catch (InvalidActionException)
-            {
+            } catch (InvalidActionException) {
                 errorCode = ServerActionErrorCode.InvalidAction;
                 actionFinished(
                     success: false,
                     errorMessage: "Invalid action: " + controlCommand.action
                 );
-            }
-            catch (TargetInvocationException e)
-            {
+            } catch (TargetInvocationException e) {
                 // TargetInvocationException is called whenever an action
                 // throws an exception. It is used to short circuit errors,
                 // which terminates the action immediately.
@@ -3285,17 +2864,13 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
                     success: false,
                     errorMessage: $"{e.InnerException.GetType().Name}: {e.InnerException.Message}. trace: {e.InnerException.StackTrace.ToString()}"
                 );
-            }
-            catch (MissingActionFinishedException e)
-            {
+            } catch (MissingActionFinishedException e) {
                 errorCode = ServerActionErrorCode.MissingActionFinished;
                 actionFinished(
                     false,
                     errorMessage: $"Action '{controlCommand.action}' did not return an `ActionFinished`. Possible bug with the action and it's execution path given the arguments it was called with. Arguments: {controlCommand.jObject.ToString()}"
                 );
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.LogError("Caught error with invoke for action: " + controlCommand.action);
                 Debug.LogError("Action error message: " + errorMessage);
                 errorMessage += e.ToString();
@@ -3310,34 +2885,29 @@ public void ProcessControlCommand<T>(DynamicServerAction controlCommand, T targe
         }
 
         // no op action
-        public void Pass()
-        {
+        public void Pass() {
             actionFinished(true);
         }
 
-        protected IEnumerator waitForSecondsRealtime(int seconds)
-        {
+        protected IEnumerator waitForSecondsRealtime(int seconds) {
             yield return null; // Necessary as counting happens at the end of the last frame
             yield return new WaitForSecondsRealtime(seconds);
             actionFinished(true);
         }
 
-        public void Sleep(int seconds)
-        {
+        public void Sleep(int seconds) {
             StartCoroutine(waitForSecondsRealtime(seconds));
         }
 
 #if UNITY_EDITOR
         // for use in Editor to test the Reset function.
-        public void Reset(ServerAction action)
-        {
+        public void Reset(ServerAction action) {
             physicsSceneManager.GetComponent<AgentManager>().Reset(action);
         }
 #endif
 
         // no op action
-        public void Done()
-        {
+        public void Done() {
             actionFinished(true);
         }
 
@@ -3346,19 +2916,16 @@ public void Done()
         protected SimObjPhysics getInteractableSimObjectFromId(
             string objectId,
             bool forceAction = false
-        )
-        {
+        ) {
             // an objectId was given, so find that target in the scene if it exists
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 throw new ArgumentException(
                     $"objectId: {objectId} is not the objectId on any object in the scene!"
                 );
             }
 
             SimObjPhysics sop = getSimObjectFromId(objectId);
-            if (sop == null)
-            {
+            if (sop == null) {
                 throw new NullReferenceException($"Object with id '{objectId}' is null");
             }
 
@@ -3372,15 +2939,13 @@ protected SimObjPhysics getInteractableSimObjectFromId(
                 ).Length == 1;
 
             // target not found!
-            if (!visible && !forceAction)
-            {
+            if (!visible && !forceAction) {
                 throw new NullReferenceException(
                     "Target object not found within the specified visibility."
                 );
             }
 
-            if (interactable.Length == 0 && !forceAction)
-            {
+            if (interactable.Length == 0 && !forceAction) {
                 throw new NullReferenceException(
                     "Target object is visible but not interactable. It is likely obstructed by some clear object like glass."
                 );
@@ -3391,10 +2956,8 @@ protected SimObjPhysics getInteractableSimObjectFromId(
 
         // Helper method that parses (x and y) parameters to return the
         // sim object that they target.
-        protected SimObjPhysics getInteractableSimObjectFromXY(float x, float y, bool forceAction)
-        {
-            if (x < 0 || x > 1 || y < 0 || y > 1)
-            {
+        protected SimObjPhysics getInteractableSimObjectFromXY(float x, float y, bool forceAction) {
+            if (x < 0 || x > 1 || y < 0 || y > 1) {
                 throw new ArgumentOutOfRangeException("x/y must be in [0:1]");
             }
 
@@ -3422,21 +2985,16 @@ protected SimObjPhysics getInteractableSimObjectFromXY(float x, float y, bool fo
                 queryTriggerInteraction: QueryTriggerInteraction.Ignore
             );
 
-            if (!hitObject || hit.transform.GetComponent<SimObjPhysics>() == null)
-            {
+            if (!hitObject || hit.transform.GetComponent<SimObjPhysics>() == null) {
                 throw new InvalidOperationException($"No SimObject found at (x: {x}, y: {y})");
             }
 
             SimObjPhysics target = hit.transform.GetComponent<SimObjPhysics>();
 
-            if (!forceAction)
-            {
-                try
-                {
+            if (!forceAction) {
+                try {
                     assertPosInView(targetPosition: hit.point);
-                }
-                catch (InvalidOperationException e)
-                {
+                } catch (InvalidOperationException e) {
                     throw new InvalidOperationException(
                         $"Target sim object: ({target.ObjectID}) at screen coordinate: ({x}, {y}) is beyond your visibilityDistance: {maxVisibleDistance}!\n"
                             + "Hint: Ignore this check by passing in forceAction=True or update visibility distance, call controller.reset(visibilityDistance=<new visibility distance>)."
@@ -3453,14 +3011,12 @@ protected void assertPosInView(
             Vector3 targetPosition,
             bool inViewport = true,
             bool inMaxVisibleDistance = true
-        )
-        {
+        ) {
             // now check if the target position is within bounds of the Agent's forward (z) view
             Vector3 tmp = m_Camera.transform.position;
             tmp.y = targetPosition.y;
 
-            if (inMaxVisibleDistance && Vector3.Distance(tmp, targetPosition) > maxVisibleDistance)
-            {
+            if (inMaxVisibleDistance && Vector3.Distance(tmp, targetPosition) > maxVisibleDistance) {
                 throw new InvalidOperationException("target is outside of maxVisibleDistance");
             }
 
@@ -3468,8 +3024,7 @@ protected void assertPosInView(
             Vector3 vp = m_Camera.WorldToViewportPoint(targetPosition);
             if (
                 inViewport && (vp.z < 0 || vp.x > 1.0f || vp.y < 0.0f || vp.y > 1.0f || vp.y < 0.0f)
-            )
-            {
+            ) {
                 throw new InvalidOperationException("target is outside of Agent Viewport");
             }
         }
@@ -3480,8 +3035,7 @@ protected void screenToWorldTarget(
             ref SimObjPhysics target,
             bool forceAction = false,
             bool checkVisible = true
-        )
-        {
+        ) {
             // this version doesn't use a RaycastHit, so pass just a default one
             RaycastHit hit = new RaycastHit();
             screenToWorldTarget(
@@ -3503,10 +3057,8 @@ protected void screenToWorldTarget(
             out RaycastHit hit,
             bool forceAction = false,
             bool checkVisible = true
-        )
-        {
-            if (x < 0 || x > 1 || y < 0 || y > 1)
-            {
+        ) {
+            if (x < 0 || x > 1 || y < 0 || y > 1) {
                 throw new ArgumentOutOfRangeException("x/y must be in [0:1]");
             }
 
@@ -3534,16 +3086,14 @@ protected void screenToWorldTarget(
                     ),
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 // DEBUG STUFF PLEASE COMMENT OUT UNLESS USING//////
                 // GameObject empty = new GameObject("empty");
                 // Instantiate(empty, hit.point, Quaternion.identity);
                 // GameObject.Destroy(empty);
                 ///////////////////////////////////////
 
-                if (!hit.transform.GetComponentInParent<SimObjPhysics>())
-                {
+                if (!hit.transform.GetComponentInParent<SimObjPhysics>()) {
                     // object hit was not a sim object
                     throw new InvalidOperationException($"no sim objects found at ({x},{y})");
                 }
@@ -3558,8 +3108,7 @@ protected void screenToWorldTarget(
                 );
 
                 // now check if the object is flagged as Visible by the visibility point logic
-                if (checkVisible && !forceAction && !IsInteractable(target))
-                {
+                if (checkVisible && !forceAction && !IsInteractable(target)) {
                     // the potential target sim object hit by the ray is not currently visible to the agent
                     throw new InvalidOperationException(
                         $"target hit ({target.objectID}) at ({x}, {y}) is not currently Visible to Agent"
@@ -3573,17 +3122,14 @@ protected void screenToWorldTarget(
         // if checkVisible is true and target is found, the object is also interactable to the agent
         // this does not account for objects behind transparent objects like shower glass, as the raycast check
         // will hit the transparent object FIRST
-        public void GetObjectInFrame(float x, float y, bool checkVisible = false)
-        {
+        public void GetObjectInFrame(float x, float y, bool checkVisible = false) {
             SimObjPhysics target = null;
             screenToWorldTarget(x: x, y: y, target: ref target, checkVisible: checkVisible);
             actionFinishedEmit(success: true, actionReturn: target.ObjectID);
         }
 
-        public void GetCoordinateFromRaycast(float x, float y)
-        {
-            if (x < 0 || y < 0 || x > 1 || y > 1)
-            {
+        public void GetCoordinateFromRaycast(float x, float y) {
+            if (x < 0 || y < 0 || x > 1 || y > 1) {
                 throw new ArgumentOutOfRangeException(
                     $"x and y must be in [0:1] not (x={x}, y={y})."
                 );
@@ -3611,8 +3157,7 @@ public void GetCoordinateFromRaycast(float x, float y)
             actionFinishedEmit(success: true, actionReturn: hit.point);
         }
 
-        public void GetObjectHitFromRaycast(Vector3 origin, Vector3 destination)
-        {
+        public void GetObjectHitFromRaycast(Vector3 origin, Vector3 destination) {
             RaycastHit hit;
             if (
                 !Physics.Raycast(
@@ -3631,8 +3176,7 @@ public void GetObjectHitFromRaycast(Vector3 origin, Vector3 destination)
                     ),
                     queryTriggerInteraction: QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: (
@@ -3644,8 +3188,7 @@ public void GetObjectHitFromRaycast(Vector3 origin, Vector3 destination)
                 return;
             }
             SimObjPhysics target = hit.transform.GetComponentInParent<SimObjPhysics>();
-            if (target == null)
-            {
+            if (target == null) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: (
@@ -3659,8 +3202,7 @@ public void GetObjectHitFromRaycast(Vector3 origin, Vector3 destination)
             actionFinishedEmit(success: true, actionReturn: target.ObjectID);
         }
 
-        public void PerformRaycast(Vector3 origin, Vector3 destination)
-        {
+        public void PerformRaycast(Vector3 origin, Vector3 destination) {
             RaycastHit hit;
             if (
                 !Physics.Raycast(
@@ -3679,8 +3221,7 @@ public void PerformRaycast(Vector3 origin, Vector3 destination)
                     ),
                     queryTriggerInteraction: QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: (
@@ -3692,8 +3233,7 @@ public void PerformRaycast(Vector3 origin, Vector3 destination)
                 return;
             }
             SimObjPhysics target = hit.transform.GetComponentInParent<SimObjPhysics>();
-            if (target == null)
-            {
+            if (target == null) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: (
@@ -3706,8 +3246,7 @@ public void PerformRaycast(Vector3 origin, Vector3 destination)
             }
             actionFinishedEmit(
                 success: true,
-                actionReturn: new Dictionary<string, object>()
-                {
+                actionReturn: new Dictionary<string, object>() {
                     ["objectId"] = target.ObjectID,
                     ["hitPoint"] = hit.point,
                     ["hitDistance"] = hit.distance
@@ -3715,29 +3254,24 @@ public void PerformRaycast(Vector3 origin, Vector3 destination)
             );
         }
 
-        public void GetVisibilityPoints(string objectId)
-        {
+        public void GetVisibilityPoints(string objectId) {
             SimObjPhysics sop = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
             );
-            if (sop.VisibilityPoints == null)
-            {
+            if (sop.VisibilityPoints == null) {
                 throw new ArgumentException($"objectId: {objectId} has no visibility points!");
             }
 
             Vector3[] points = new Vector3[sop.VisibilityPoints.Length];
-            for (int i = 0; i < points.Length; i++)
-            {
+            for (int i = 0; i < points.Length; i++) {
                 points[i] = sop.VisibilityPoints[i].position;
             }
             actionFinishedEmit(success: true, actionReturn: points);
         }
 
-        protected void snapAgentToGrid()
-        {
-            if (this.snapToGrid)
-            {
+        protected void snapAgentToGrid() {
+            if (this.snapToGrid) {
                 float mult = 1 / gridSize;
                 float gridX = Convert.ToSingle(Math.Round(this.transform.position.x * mult) / mult);
                 float gridZ = Convert.ToSingle(Math.Round(this.transform.position.z * mult) / mult);
@@ -3746,30 +3280,24 @@ protected void snapAgentToGrid()
             }
         }
 
-        protected bool isPositionOnGrid(Vector3 xyz)
-        {
-            if (this.snapToGrid)
-            {
+        protected bool isPositionOnGrid(Vector3 xyz) {
+            if (this.snapToGrid) {
                 float mult = 1 / gridSize;
                 float gridX = Convert.ToSingle(Math.Round(xyz.x * mult) / mult);
                 float gridZ = Convert.ToSingle(Math.Round(xyz.z * mult) / mult);
 
                 return (Mathf.Approximately(gridX, xyz.x) && Mathf.Approximately(gridZ, xyz.z));
-            }
-            else
-            {
+            } else {
                 return true;
             }
         }
 
         // move in cardinal directions
-        virtual protected void moveCharacter(ServerAction action, int targetOrientation)
-        {
+        virtual protected void moveCharacter(ServerAction action, int targetOrientation) {
             // TODO: Simplify this???
             // resetHand(); when I looked at this resetHand in DiscreteRemoteFPSAgent was just commented out doing nothing so...
             moveMagnitude = gridSize;
-            if (action.moveMagnitude > 0)
-            {
+            if (action.moveMagnitude > 0) {
                 moveMagnitude = action.moveMagnitude;
             }
             int currentRotation = (int)Math.Round(transform.rotation.eulerAngles.y, 0);
@@ -3781,12 +3309,9 @@ virtual protected void moveCharacter(ServerAction action, int targetOrientation)
             int delta = (currentRotation + targetOrientation) % 360;
 
             Vector3 m;
-            if (actionOrientation.ContainsKey(delta))
-            {
+            if (actionOrientation.ContainsKey(delta)) {
                 m = actionOrientation[delta];
-            }
-            else
-            {
+            } else {
                 actionOrientation = new Dictionary<int, Vector3>();
                 actionOrientation.Add(0, transform.forward);
                 actionOrientation.Add(90, transform.right);
@@ -3804,21 +3329,18 @@ virtual protected void moveCharacter(ServerAction action, int targetOrientation)
         }
 
         // iterates to next allowed downward horizon angle for AgentCamera (max 60 degrees down)
-        public virtual void LookDown(ServerAction controlCommand)
-        {
+        public virtual void LookDown(ServerAction controlCommand) {
             m_Camera.transform.Rotate(controlCommand.degrees, 0, 0);
             actionFinished(true);
         }
 
         // iterates to next allowed upward horizon angle for agent camera (max 30 degrees up)
-        public virtual void LookUp(ServerAction controlCommand)
-        {
+        public virtual void LookUp(ServerAction controlCommand) {
             m_Camera.transform.Rotate(-controlCommand.degrees, 0, 0);
             actionFinished(true);
         }
 
-        protected bool checkForUpDownAngleLimit(string direction, float degrees)
-        {
+        protected bool checkForUpDownAngleLimit(string direction, float degrees) {
             bool result = true;
             // check the angle between the agent's forward vector and the proposed rotation vector
             // if it exceeds the min/max based on if we are rotating up or down, return false
@@ -3829,8 +3351,7 @@ protected bool checkForUpDownAngleLimit(string direction, float degrees)
             rotPoint.transform.rotation = m_Camera.transform.rotation;
 
             // print(Vector3.Angle(rotPoint.transform.forward, m_CharacterController.transform.forward));
-            if (direction == "down")
-            {
+            if (direction == "down") {
                 rotPoint.Rotate(new Vector3(degrees, 0, 0));
                 // note: maxDownwardLookAngle is negative because SignedAngle() returns a... signed angle... so even though the input is LookDown(degrees) with
                 // degrees being positive, it still needs to check against this negatively signed direction.
@@ -3843,14 +3364,12 @@ protected bool checkForUpDownAngleLimit(string direction, float degrees)
                         ) * 10.0f
                     ) / 10.0f
                     < -maxDownwardLookAngle
-                )
-                {
+                ) {
                     result = false;
                 }
             }
 
-            if (direction == "up")
-            {
+            if (direction == "up") {
                 rotPoint.Rotate(new Vector3(-degrees, 0, 0));
                 if (
                     Mathf.Round(
@@ -3861,8 +3380,7 @@ protected bool checkForUpDownAngleLimit(string direction, float degrees)
                         ) * 10.0f
                     ) / 10.0f
                     > maxUpwardLookAngle
-                )
-                {
+                ) {
                     result = false;
                 }
             }
@@ -3880,8 +3398,7 @@ protected void teleport(
             Vector3? rotation,
             float? horizon,
             bool forceAction
-        )
-        {
+        ) {
             teleportFull(
                 position: position,
                 rotation: rotation,
@@ -3895,11 +3412,9 @@ bool forceAction
         ///////////////////////////////////////////
 
         // this is not used with non-grounded agents (e.g., drones)
-        protected virtual void assertTeleportedNearGround(Vector3? targetPosition)
-        {
+        protected virtual void assertTeleportedNearGround(Vector3? targetPosition) {
             // position should not change if it's null.
-            if (targetPosition == null)
-            {
+            if (targetPosition == null) {
                 return;
             }
 
@@ -3913,8 +3428,7 @@ protected virtual void assertTeleportedNearGround(Vector3? targetPosition)
             );
 
             // perhaps like y=2 was specified, with an agent's standing height of 0.9
-            if (Mathf.Abs(transform.position.y - pos.y) > 0.05f)
-            {
+            if (Mathf.Abs(transform.position.y - pos.y) > 0.05f) {
                 throw new InvalidOperationException(
                     "After teleporting and adjusting agent position to floor, there was too large a change"
                         + $"({Mathf.Abs(transform.position.y - pos.y)} > 0.05) in the y component."
@@ -3928,16 +3442,14 @@ protected virtual void teleportFull(
             Vector3? rotation,
             float? horizon,
             bool forceAction
-        )
-        {
+        ) {
             if (
                 rotation.HasValue
                 && (
                     !Mathf.Approximately(rotation.Value.x, 0f)
                     || !Mathf.Approximately(rotation.Value.z, 0f)
                 )
-            )
-            {
+            ) {
                 throw new ArgumentOutOfRangeException(
                     "No agents currently can change in pitch or roll. So, you must set rotation(x=0, y=yaw, z=0)."
                         + $" You gave {rotation.Value.ToString("F6")}."
@@ -3949,8 +3461,7 @@ bool forceAction
                 !forceAction
                 && horizon.HasValue
                 && (horizon.Value > maxDownwardLookAngle || horizon.Value < -maxUpwardLookAngle)
-            )
-            {
+            ) {
                 throw new ArgumentOutOfRangeException(
                     $"Each horizon must be in [{-maxUpwardLookAngle}:{maxDownwardLookAngle}]. You gave {horizon}."
                 );
@@ -3960,15 +3471,13 @@ bool forceAction
                 !forceAction
                 && position.HasValue
                 && !agentManager.SceneBounds.Contains(position.Value)
-            )
-            {
+            ) {
                 throw new ArgumentOutOfRangeException(
                     $"Teleport position {position.Value.ToString("F6")} out of scene bounds! Ignore this by setting forceAction=true."
                 );
             }
 
-            if (!forceAction && position.HasValue && !isPositionOnGrid(position.Value))
-            {
+            if (!forceAction && position.HasValue && !isPositionOnGrid(position.Value)) {
                 throw new ArgumentOutOfRangeException(
                     $"Teleport position {position.Value.ToString("F6")} is not on the grid of size {gridSize}."
                 );
@@ -3994,8 +3503,7 @@ bool forceAction
                     collidersToIgnore: collidersToIgnoreDuringMovement,
                     includeErrorMessage: true
                 )
-            )
-            {
+            ) {
                 transform.position = oldPosition;
                 transform.rotation = oldRotation;
                 m_Camera.transform.localEulerAngles = oldCameraLocalEulerAngles;
@@ -4011,10 +3519,8 @@ public void TeleportObject(
             bool forceKinematic = false,
             bool allowTeleportOutOfHand = false,
             bool makeUnbreakable = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}";
                 actionFinished(false);
                 return;
@@ -4032,21 +3538,15 @@ public void TeleportObject(
                 includeErrorMessage: true
             );
 
-            if (teleportSuccess)
-            {
-                if (!forceKinematic)
-                {
+            if (teleportSuccess) {
+                if (!forceKinematic) {
                     StartCoroutine(checkIfObjectHasStoppedMoving(sop: sop, useTimeout: true));
                     return;
-                }
-                else
-                {
+                } else {
                     actionFinished(true);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
                 return;
             }
@@ -4060,10 +3560,8 @@ public void TeleportObject(
             bool forceKinematic = false,
             bool allowTeleportOutOfHand = false,
             bool makeUnbreakable = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}";
                 actionFinished(false);
                 return;
@@ -4071,8 +3569,7 @@ public void TeleportObject(
             SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             bool teleportSuccess = false;
-            foreach (Vector3 position in positions)
-            {
+            foreach (Vector3 position in positions) {
                 teleportSuccess = TeleportObject(
                     sop: sop,
                     position: position,
@@ -4083,15 +3580,13 @@ public void TeleportObject(
                     makeUnbreakable: makeUnbreakable,
                     includeErrorMessage: true
                 );
-                if (teleportSuccess)
-                {
+                if (teleportSuccess) {
                     errorMessage = "";
                     break;
                 }
             }
 
-            if (teleportSuccess)
-            {
+            if (teleportSuccess) {
                 // TODO: Do we want to wait for objects to stop moving when teleported?
                 // if (!forceKinematic) {
                 //     StartCoroutine(checkIfObjectHasStoppedMoving(sop, 0, true));
@@ -4099,9 +3594,7 @@ public void TeleportObject(
                 // }
                 actionFinished(true);
                 return;
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
                 return;
             }
@@ -4116,13 +3609,10 @@ public bool TeleportObject(
             bool allowTeleportOutOfHand,
             bool makeUnbreakable,
             bool includeErrorMessage = false
-        )
-        {
+        ) {
             bool sopInHand = ItemInHand != null && sop == ItemInHand.GetComponent<SimObjPhysics>();
-            if (sopInHand && !allowTeleportOutOfHand)
-            {
-                if (includeErrorMessage)
-                {
+            if (sopInHand && !allowTeleportOutOfHand) {
+                if (includeErrorMessage) {
                     errorMessage = "Cannot teleport object in hand.";
                 }
                 return false;
@@ -4132,23 +3622,19 @@ public bool TeleportObject(
 
             sop.transform.position = position;
             sop.transform.rotation = Quaternion.Euler(rotation);
-            if (forceKinematic)
-            {
+            if (forceKinematic) {
                 sop.GetComponent<Rigidbody>().isKinematic = true;
             }
-            if (!forceAction)
-            {
+            if (!forceAction) {
                 Collider colliderHitIfTeleported =
                     UtilityFunctions.firstColliderObjectCollidingWith(sop.gameObject);
-                if (colliderHitIfTeleported != null)
-                {
+                if (colliderHitIfTeleported != null) {
                     sop.transform.position = oldPosition;
                     sop.transform.rotation = oldRotation;
                     SimObjPhysics hitSop = ancestorSimObjPhysics(
                         colliderHitIfTeleported.gameObject
                     );
-                    if (includeErrorMessage)
-                    {
+                    if (includeErrorMessage) {
                         errorMessage =
                             $"{sop.ObjectID} is colliding with {(hitSop != null ? hitSop.ObjectID : colliderHitIfTeleported.name)} after teleport.";
                     }
@@ -4156,30 +3642,23 @@ public bool TeleportObject(
                 }
             }
 
-            if (makeUnbreakable)
-            {
-                if (sop.GetComponent<Break>())
-                {
+            if (makeUnbreakable) {
+                if (sop.GetComponent<Break>()) {
                     sop.GetComponent<Break>().Unbreakable = true;
                 }
             }
 
-            if (sopInHand)
-            {
-                if (!forceKinematic)
-                {
+            if (sopInHand) {
+                if (!forceKinematic) {
                     Rigidbody rb = ItemInHand.GetComponent<Rigidbody>();
                     rb.constraints = RigidbodyConstraints.None;
                     rb.useGravity = true;
                     rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
                 }
                 GameObject topObject = GameObject.Find("Objects");
-                if (topObject != null)
-                {
+                if (topObject != null) {
                     ItemInHand.transform.parent = topObject.transform;
-                }
-                else
-                {
+                } else {
                     ItemInHand.transform.parent = null;
                 }
 
@@ -4204,8 +3683,7 @@ public void TeleportObject(
             bool forceKinematic = false,
             bool allowTeleportOutOfHand = false,
             bool makeUnbreakable = false
-        )
-        {
+        ) {
             TeleportObject(
                 objectId: objectId,
                 position: new Vector3(x, y, z),
@@ -4223,28 +3701,23 @@ public void TeleportObject(
         protected IEnumerator checkIfObjectHasStoppedMoving(
             SimObjPhysics sop,
             bool useTimeout = false
-        )
-        {
+        ) {
             // yield for the physics update to make sure this yield is consistent regardless of framerate
             yield return new WaitForFixedUpdate();
 
             float startTime = Time.time;
             float waitTime = TimeToWaitForObjectsToComeToRest;
 
-            if (useTimeout)
-            {
+            if (useTimeout) {
                 waitTime = 1.0f;
             }
 
-            if (sop != null)
-            {
+            if (sop != null) {
                 Rigidbody rb = sop.GetComponentInChildren<Rigidbody>();
                 bool stoppedMoving = false;
 
-                while (Time.time - startTime < waitTime)
-                {
-                    if (sop == null)
-                    {
+                while (Time.time - startTime < waitTime) {
+                    if (sop == null) {
                         break;
                     }
 
@@ -4254,24 +3727,20 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
                     float accel = (currentVelocity - sop.lastVelocity) / Time.fixedDeltaTime;
 
                     // ok the accel is basically zero, so it has stopped moving
-                    if (Mathf.Abs(accel) <= 0.001f)
-                    {
+                    if (Mathf.Abs(accel) <= 0.001f) {
                         // force the rb to stop moving just to be safe
                         rb.velocity = Vector3.zero;
                         rb.angularVelocity = Vector3.zero;
                         rb.Sleep();
                         stoppedMoving = true;
                         break;
-                    }
-                    else
-                    {
+                    } else {
                         yield return new WaitForFixedUpdate();
                     }
                 }
 
                 // so we never stopped moving and we are using the timeout
-                if (!stoppedMoving && useTimeout)
-                {
+                if (!stoppedMoving && useTimeout) {
                     errorMessage = "object couldn't come to rest";
                     // print(errorMessage);
                     actionFinished(false);
@@ -4280,19 +3749,15 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
 
                 DefaultAgentHand();
                 actionFinished(true, sop.transform.position);
-            }
-            else
-            {
+            } else {
                 errorMessage = "null reference sim obj in checkIfObjectHasStoppedMoving call";
                 actionFinished(false);
             }
         }
 
-        public void SetObjectPoses(ServerAction action)
-        {
+        public void SetObjectPoses(ServerAction action) {
             // make sure objectPoses and also the Object Pose elements inside are initialized correctly
-            if (action.objectPoses == null || action.objectPoses[0] == null)
-            {
+            if (action.objectPoses == null || action.objectPoses[0] == null) {
                 errorMessage =
                     "objectPoses was not initialized correctly. Please make sure each element in the objectPoses list is initialized.";
                 actionFinished(false);
@@ -4305,8 +3770,7 @@ public void SetObjectPoses(ServerAction action)
         // a frame does not pass prior to this AND the imageSynthesis
         // is enabled for say depth or normals, Unity will crash on
         // a subsequent scene reset()
-        protected IEnumerator setObjectPoses(ObjectPose[] objectPoses, bool placeStationary)
-        {
+        protected IEnumerator setObjectPoses(ObjectPose[] objectPoses, bool placeStationary) {
             yield return new WaitForEndOfFrame();
             bool success = physicsSceneManager.SetObjectPoses(
                 objectPoses,
@@ -4315,8 +3779,7 @@ protected IEnumerator setObjectPoses(ObjectPose[] objectPoses, bool placeStation
             );
 
             //update image synthesis since scene has changed
-            if (this.imageSynthesis && this.imageSynthesis.enabled)
-            {
+            if (this.imageSynthesis && this.imageSynthesis.enabled) {
                 this.imageSynthesis.OnSceneChange();
             }
             actionFinished(success, errorMessage);
@@ -4357,10 +3820,8 @@ public void PlaceObjectAtPoint(
             Vector3 position,
             Vector3? rotation = null,
             bool forceKinematic = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -4377,21 +3838,15 @@ public void PlaceObjectAtPoint(
                 includeErrorMessage: true
             );
 
-            if (placeObjectSuccess)
-            {
-                if (!forceKinematic)
-                {
+            if (placeObjectSuccess) {
+                if (!forceKinematic) {
                     StartCoroutine(checkIfObjectHasStoppedMoving(sop: target, useTimeout: true));
                     return;
-                }
-                else
-                {
+                } else {
                     actionFinished(true);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
                 return;
             }
@@ -4403,13 +3858,10 @@ public bool PlaceObjectAtPoint(
             Vector3? rotation,
             bool forceKinematic,
             bool includeErrorMessage = false
-        )
-        {
+        ) {
             // make sure point we are moving the object to is valid
-            if (!agentManager.sceneBounds.Contains(position))
-            {
-                if (includeErrorMessage)
-                {
+            if (!agentManager.sceneBounds.Contains(position)) {
+                if (includeErrorMessage) {
                     errorMessage =
                         $"Position coordinate ({position}) is not within scene bounds ({agentManager.sceneBounds})";
                 }
@@ -4417,24 +3869,20 @@ public bool PlaceObjectAtPoint(
             }
 
             Quaternion originalRotation = target.transform.rotation;
-            if (rotation.HasValue)
-            {
+            if (rotation.HasValue) {
                 target.transform.rotation = Quaternion.Euler(rotation.Value);
             }
             Vector3 originalPos = target.transform.position;
             target.transform.position =
                 agentManager.SceneBounds.min - new Vector3(-100f, -100f, -100f);
 
-            if (!Physics.autoSyncTransforms)
-            {
+            if (!Physics.autoSyncTransforms) {
                 Physics.SyncTransforms();
             }
 
             bool wasInHand = false;
-            if (ItemInHand)
-            {
-                if (ItemInHand.transform.gameObject == target.transform.gameObject)
-                {
+            if (ItemInHand) {
+                if (ItemInHand.transform.gameObject == target.transform.gameObject) {
                     wasInHand = true;
                 }
             }
@@ -4459,8 +3907,7 @@ public bool PlaceObjectAtPoint(
             // Check spawn area here
             target.transform.position = finalPos;
 
-            if (!Physics.autoSyncTransforms)
-            {
+            if (!Physics.autoSyncTransforms) {
                 Physics.SyncTransforms();
             }
 
@@ -4468,20 +3915,17 @@ public bool PlaceObjectAtPoint(
                 target.gameObject
             );
 
-            if (colliderHitIfSpawned == null)
-            {
+            if (colliderHitIfSpawned == null) {
                 target.transform.position = finalPos;
 
                 Rigidbody rb = target.GetComponent<Rigidbody>();
 
-                if (forceKinematic)
-                {
+                if (forceKinematic) {
                     rb.isKinematic = forceKinematic;
                 }
 
                 // Additional stuff we need to do if placing item that was in hand
-                if (wasInHand)
-                {
+                if (wasInHand) {
                     rb.constraints = RigidbodyConstraints.None;
                     rb.useGravity = true;
 
@@ -4490,12 +3934,9 @@ public bool PlaceObjectAtPoint(
                     rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
 
                     GameObject topObject = GameObject.Find("Objects");
-                    if (topObject != null)
-                    {
+                    if (topObject != null) {
                         ItemInHand.transform.parent = topObject.transform;
-                    }
-                    else
-                    {
+                    } else {
                         ItemInHand.transform.parent = null;
                     }
 
@@ -4513,16 +3954,14 @@ public bool PlaceObjectAtPoint(
             target.transform.rotation = originalRotation;
 
             // if the original position was in agent hand, reparent object to agent hand
-            if (wasInHand)
-            {
+            if (wasInHand) {
                 target.transform.SetParent(AgentHand.transform);
                 ItemInHand = target.gameObject;
                 target.isInAgentHand = true;
                 target.GetComponent<Rigidbody>().isKinematic = true;
             }
 
-            if (includeErrorMessage)
-            {
+            if (includeErrorMessage) {
                 SimObjPhysics hitSop = ancestorSimObjPhysics(colliderHitIfSpawned.gameObject);
                 errorMessage = (
                     $"Spawn area not clear ({(hitSop != null ? hitSop.ObjectID : colliderHitIfSpawned.name)})"
@@ -4537,10 +3976,8 @@ public void PlaceObjectAtPoint(
             Vector3[] positions,
             Vector3? rotation = null,
             bool forceKinematic = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -4551,8 +3988,7 @@ public void PlaceObjectAtPoint(
 
             bool placeObjectSuccess = false;
 
-            foreach (Vector3 position in positions)
-            {
+            foreach (Vector3 position in positions) {
                 placeObjectSuccess = PlaceObjectAtPoint(
                     target: target,
                     position: position,
@@ -4560,54 +3996,42 @@ public void PlaceObjectAtPoint(
                     forceKinematic: forceKinematic,
                     includeErrorMessage: true
                 );
-                if (placeObjectSuccess)
-                {
+                if (placeObjectSuccess) {
                     errorMessage = "";
                     break;
                 }
             }
 
-            if (placeObjectSuccess)
-            {
-                if (!forceKinematic)
-                {
+            if (placeObjectSuccess) {
+                if (!forceKinematic) {
                     StartCoroutine(checkIfObjectHasStoppedMoving(sop: target, useTimeout: true));
                     return;
-                }
-                else
-                {
+                } else {
                     actionFinished(true);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
                 return;
             }
         }
 
         // Similar to PlaceObjectAtPoint(...) above but returns a bool if successful
-        public bool placeObjectAtPoint(SimObjPhysics t, Vector3 position)
-        {
+        public bool placeObjectAtPoint(SimObjPhysics t, Vector3 position) {
             SimObjPhysics target = null;
             // find the object in the scene, disregard visibility
-            foreach (SimObjPhysics sop in VisibleSimObjs(true))
-            {
-                if (sop.objectID == t.objectID)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                if (sop.objectID == t.objectID) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 return false;
             }
 
             // make sure point we are moving the object to is valid
-            if (!agentManager.sceneBounds.Contains(position))
-            {
+            if (!agentManager.sceneBounds.Contains(position)) {
                 return false;
             }
 
@@ -4631,8 +4055,7 @@ public bool placeObjectAtPoint(SimObjPhysics t, Vector3 position)
 
             // check spawn area, if its clear, then place object at finalPos
             InstantiatePrefabTest ipt = physicsSceneManager.GetComponent<InstantiatePrefabTest>();
-            if (ipt.CheckSpawnArea(target, finalPos, target.transform.rotation, false))
-            {
+            if (ipt.CheckSpawnArea(target, finalPos, target.transform.rotation, false)) {
                 target.transform.position = finalPos;
                 return true;
             }
@@ -4642,8 +4065,7 @@ public bool placeObjectAtPoint(SimObjPhysics t, Vector3 position)
 
         // from given position in worldspace, raycast straight down and return a point of any surface hit
         // useful for getting a worldspace coordinate on the floor given any point in space.
-        public Vector3 GetSurfacePointBelowPosition(Vector3 position)
-        {
+        public Vector3 GetSurfacePointBelowPosition(Vector3 position) {
             Vector3 point = Vector3.zero;
 
             // raycast down from the position like 10m and see if you hit anything. If nothing hit, return the original position and an error message?
@@ -4665,45 +4087,36 @@ public Vector3 GetSurfacePointBelowPosition(Vector3 position)
                     ),
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 point = hit.point;
                 return point;
             }
             // nothing hit, return the original position?
-            else
-            {
+            else {
                 return position;
             }
         }
 
-        protected T[] flatten2DimArray<T>(T[,] array)
-        {
+        protected T[] flatten2DimArray<T>(T[,] array) {
             int nrow = array.GetLength(0);
             int ncol = array.GetLength(1);
             T[] flat = new T[nrow * ncol];
-            for (int i = 0; i < nrow; i++)
-            {
-                for (int j = 0; j < ncol; j++)
-                {
+            for (int i = 0; i < nrow; i++) {
+                for (int j = 0; j < ncol; j++) {
                     flat[i * ncol + j] = array[i, j];
                 }
             }
             return flat;
         }
 
-        protected T[] flatten3DimArray<T>(T[,,] array)
-        {
+        protected T[] flatten3DimArray<T>(T[,,] array) {
             int n0 = array.GetLength(0);
             int n1 = array.GetLength(1);
             int n2 = array.GetLength(2);
             T[] flat = new T[n0 * n1 * n2];
-            for (int i = 0; i < n0; i++)
-            {
-                for (int j = 0; j < n1; j++)
-                {
-                    for (int k = 0; k < n2; k++)
-                    {
+            for (int i = 0; i < n0; i++) {
+                for (int j = 0; j < n1; j++) {
+                    for (int k = 0; k < n2; k++) {
                         flat[i * n1 * n2 + j * n2 + k] = array[i, j, k];
                     }
                 }
@@ -4711,16 +4124,13 @@ protected T[] flatten3DimArray<T>(T[,,] array)
             return flat;
         }
 
-        protected List<Vector3> visibleRange()
-        {
+        protected List<Vector3> visibleRange() {
             int n = 5;
             List<Vector3> points = new List<Vector3>();
             points.Add(transform.position);
             updateAllAgentCollidersForVisibilityCheck(false);
-            for (int i = 0; i < n; i++)
-            {
-                for (int j = 0; j < n; j++)
-                {
+            for (int i = 0; i < n; i++) {
+                for (int j = 0; j < n; j++) {
                     RaycastHit hit;
                     Ray ray = m_Camera.ViewportPointToRay(
                         new Vector3((i + 0.5f) / n, (j + 0.5f) / n, 0.0f)
@@ -4739,8 +4149,7 @@ protected List<Vector3> visibleRange()
                                 "Agent"
                             )
                         )
-                    )
-                    {
+                    ) {
                         points.Add(hit.point);
                     }
                 }
@@ -4754,38 +4163,28 @@ protected List<Vector3> visibleRange()
         // enableColliders == false and after with it equaling true). It, in particular, will
         // turn off/on all the colliders on agents which should not block visibility for the current agent
         // (invisible agents for example).
-        protected void updateAllAgentCollidersForVisibilityCheck(bool enableColliders)
-        {
-            foreach (BaseFPSAgentController agent in this.agentManager.agents)
-            {
+        protected void updateAllAgentCollidersForVisibilityCheck(bool enableColliders) {
+            foreach (BaseFPSAgentController agent in this.agentManager.agents) {
                 bool overlapping =
                     (transform.position - agent.transform.position).magnitude < 0.001f;
-                if (overlapping || agent == this || !agent.IsVisible)
-                {
+                if (overlapping || agent == this || !agent.IsVisible) {
                     agent.updateCollidersForVisiblityCheck(enableColliders);
                 }
             }
         }
 
-        protected virtual void updateCollidersForVisiblityCheck(bool enableColliders)
-        {
-            if (enableColliders)
-            {
-                foreach (Collider c in this.collidersDisabledForVisbilityCheck)
-                {
+        protected virtual void updateCollidersForVisiblityCheck(bool enableColliders) {
+            if (enableColliders) {
+                foreach (Collider c in this.collidersDisabledForVisbilityCheck) {
                     c.enabled = true;
                 }
                 this.collidersDisabledForVisbilityCheck.Clear();
-            }
-            else
-            {
+            } else {
                 HashSet<Collider> collidersToNotDisable = new HashSet<Collider>();
 
                 // Don't disable colliders for the object held in the hand
-                if (ItemInHand != null)
-                {
-                    foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>())
-                    {
+                if (ItemInHand != null) {
+                    foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>()) {
                         collidersToNotDisable.Add(c);
                     }
                 }
@@ -4793,66 +4192,47 @@ protected virtual void updateCollidersForVisiblityCheck(bool enableColliders)
                 // Don't disable colliders for the arm (unless the agent is invisible)
                 // or for any objects held by the arm
                 // Standard IK arm
-                if (Arm != null && Arm.gameObject.activeSelf)
-                {
-                    if (this.IsVisible)
-                    {
-                        foreach (Collider c in Arm.gameObject.GetComponentsInChildren<Collider>())
-                        {
-                            if (!c.isTrigger)
-                            {
+                if (Arm != null && Arm.gameObject.activeSelf) {
+                    if (this.IsVisible) {
+                        foreach (Collider c in Arm.gameObject.GetComponentsInChildren<Collider>()) {
+                            if (!c.isTrigger) {
                                 collidersToNotDisable.Add(c);
                             }
                         }
-                    }
-                    else
-                    {
-                        foreach (HashSet<Collider> hsc in Arm.heldObjects.Values)
-                        {
-                            foreach (Collider c in hsc)
-                            {
+                    } else {
+                        foreach (HashSet<Collider> hsc in Arm.heldObjects.Values) {
+                            foreach (Collider c in hsc) {
                                 collidersToNotDisable.Add(c);
                             }
                         }
                     }
                 }
                 // Stretch arm
-                else if (SArm != null && SArm.gameObject.activeSelf)
-                {
-                    if (this.IsVisible)
-                    {
-                        foreach (Collider c in SArm.gameObject.GetComponentsInChildren<Collider>())
-                        {
-                            if (!c.isTrigger)
-                            {
+                else if (SArm != null && SArm.gameObject.activeSelf) {
+                    if (this.IsVisible) {
+                        foreach (Collider c in SArm.gameObject.GetComponentsInChildren<Collider>()) {
+                            if (!c.isTrigger) {
                                 collidersToNotDisable.Add(c);
                             }
                         }
-                    }
-                    else
-                    {
-                        foreach (HashSet<Collider> hsc in SArm.heldObjects.Values)
-                        {
-                            foreach (Collider c in hsc)
-                            {
+                    } else {
+                        foreach (HashSet<Collider> hsc in SArm.heldObjects.Values) {
+                            foreach (Collider c in hsc) {
                                 collidersToNotDisable.Add(c);
                             }
                         }
                     }
                 }
 
-                foreach (Collider c in this.GetComponentsInChildren<Collider>())
-                {
+                foreach (Collider c in this.GetComponentsInChildren<Collider>()) {
                     if (
                         c.transform.gameObject.layer == LayerMask.NameToLayer("ArticulatedAgent")
                         || c.transform.gameObject.layer == LayerMask.NameToLayer("FloorAgent")
-                    )
-                    {
+                    ) {
                         continue;
                     }
 
-                    if (!collidersToNotDisable.Contains(c))
-                    {
+                    if (!collidersToNotDisable.Contains(c)) {
                         collidersDisabledForVisbilityCheck.Add(c);
                         c.enabled = false;
                     }
@@ -4868,22 +4248,18 @@ can cause all sorts of issues.
         Note that this function is "dangerous" in that it can have unintended interactions
         with other actions. Please only use this action if you understand what you're doing.
         */
-        public void ParentObject(string parentId, string childId)
-        {
-            if (parentId == childId)
-            {
+        public void ParentObject(string parentId, string childId) {
+            if (parentId == childId) {
                 errorMessage = $"Parent id ({parentId}) must not equal child id.";
                 actionFinished(false);
                 return;
             }
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(parentId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(parentId)) {
                 errorMessage = $"No parent object with ID {parentId}";
                 actionFinished(false);
                 return;
             }
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(childId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(childId)) {
                 errorMessage = $"No parent object with ID {childId}";
                 actionFinished(false);
                 return;
@@ -4912,10 +4288,8 @@ still be changed in such a case.
         Note that this function is "dangerous" in that it can have unintended interactions
         with other actions. Please only use this action if you understand what you're doing.
         */
-        public void UnparentObject(string objectId, bool kinematic)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void UnparentObject(string objectId, bool kinematic) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"No object with ID {objectId}";
                 actionFinished(false);
                 return;
@@ -4928,76 +4302,52 @@ public void UnparentObject(string objectId, bool kinematic)
             actionFinished(true);
         }
 
-        protected bool hasAncestor(GameObject child, GameObject potentialAncestor)
-        {
-            if (child == potentialAncestor)
-            {
+        protected bool hasAncestor(GameObject child, GameObject potentialAncestor) {
+            if (child == potentialAncestor) {
                 return true;
-            }
-            else if (child.transform.parent != null)
-            {
+            } else if (child.transform.parent != null) {
                 return hasAncestor(child.transform.parent.gameObject, potentialAncestor);
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
 
-        protected bool ancestorHasName(GameObject go, string name)
-        {
-            if (go.name == name)
-            {
+        protected bool ancestorHasName(GameObject go, string name) {
+            if (go.name == name) {
                 return true;
-            }
-            else if (go.transform.parent != null)
-            {
+            } else if (go.transform.parent != null) {
                 return ancestorHasName(go.transform.parent.gameObject, name);
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
 
-        protected static SimObjPhysics ancestorSimObjPhysics(GameObject go)
-        {
-            if (go == null)
-            {
+        protected static SimObjPhysics ancestorSimObjPhysics(GameObject go) {
+            if (go == null) {
                 return null;
             }
             SimObjPhysics so = go.GetComponent<SimObjPhysics>();
-            if (so != null)
-            {
+            if (so != null) {
                 return so;
-            }
-            else if (go.transform.parent != null)
-            {
+            } else if (go.transform.parent != null) {
                 return ancestorSimObjPhysics(go.transform.parent.gameObject);
-            }
-            else
-            {
+            } else {
                 return null;
             }
         }
 
-        public void VisibleRange()
-        {
+        public void VisibleRange() {
             actionFinished(true, visibleRange());
         }
 
-        public float TimeSinceStart()
-        {
+        public float TimeSinceStart() {
             return Time.time;
         }
 
-        protected bool objectIsWithinViewport(SimObjPhysics sop)
-        {
-            if (sop.VisibilityPoints.Length > 0)
-            {
+        protected bool objectIsWithinViewport(SimObjPhysics sop) {
+            if (sop.VisibilityPoints.Length > 0) {
                 Transform[] visPoints = sop.VisibilityPoints;
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     Vector3 viewPoint = m_Camera.WorldToViewportPoint(point.position);
                     float ViewPointRangeHigh = 1.0f;
                     float ViewPointRangeLow = 0.0f;
@@ -5009,14 +4359,11 @@ protected bool objectIsWithinViewport(SimObjPhysics sop)
                         && // within x bounds of viewport
                         viewPoint.y < ViewPointRangeHigh
                         && viewPoint.y > ViewPointRangeLow // within y bounds of viewport
-                    )
-                    {
+                    ) {
                         return true;
                     }
                 }
-            }
-            else
-            {
+            } else {
 #if UNITY_EDITOR
                 Debug.Log("Error! Set at least 1 visibility point on SimObjPhysics prefab!");
 #endif
@@ -5024,39 +4371,32 @@ protected bool objectIsWithinViewport(SimObjPhysics sop)
             return false;
         }
 
-        public VisibilityCheck isSimObjVisible(Camera camera, SimObjPhysics sop, float maxDistance)
-        {
+        public VisibilityCheck isSimObjVisible(Camera camera, SimObjPhysics sop, float maxDistance) {
             VisibilityCheck visCheck = new VisibilityCheck();
             // check against all visibility points, accumulate count. If at least one point is visible, set object to visible
-            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0)
-            {
+            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0) {
                 Transform[] visPoints = sop.VisibilityPoints;
 
                 float maxDistanceSquared = maxDistance * maxDistance;
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     float xdelta = Math.Abs(camera.transform.position.x - point.position.x);
-                    if (xdelta > maxDistance)
-                    {
+                    if (xdelta > maxDistance) {
                         continue;
                     }
 
                     float zdelta = Math.Abs(camera.transform.position.z - point.position.z);
-                    if (zdelta > maxDistance)
-                    {
+                    if (zdelta > maxDistance) {
                         continue;
                     }
 
                     // if the object is too far above the camera, skip
                     float ydelta = point.position.y - camera.transform.position.y;
-                    if (ydelta > maxDistance)
-                    {
+                    if (ydelta > maxDistance) {
                         continue;
                     }
 
                     double distanceSquared = (xdelta * xdelta) + (zdelta * zdelta);
-                    if (distanceSquared > maxDistanceSquared)
-                    {
+                    if (distanceSquared > maxDistanceSquared) {
                         continue;
                     }
 
@@ -5067,8 +4407,7 @@ public VisibilityCheck isSimObjVisible(Camera camera, SimObjPhysics sop, float m
                         camera,
                         sop.IsReceptacle
                     );
-                    if (visCheck.visible && visCheck.interactable)
-                    {
+                    if (visCheck.visible && visCheck.interactable) {
 #if !UNITY_EDITOR
                         // If we're in the unity editor then don't break on finding a visible
                         // point as we want to draw lines to each visible point.
@@ -5082,9 +4421,7 @@ public VisibilityCheck isSimObjVisible(Camera camera, SimObjPhysics sop, float m
                 sop.debugIsVisible = visCheck.visible;
                 sop.debugIsInteractable = visCheck.interactable;
 #endif
-            }
-            else
-            {
+            } else {
                 Debug.Log("Error! Set at least 1 visibility point on SimObjPhysics " + sop + ".");
             }
             return visCheck;
@@ -5095,64 +4432,53 @@ public VisibilityCheck isSimObjVisible(
             SimObjPhysics sop,
             float maxDistance,
             Plane[] planes
-        )
-        {
+        ) {
             // check against all visibility points, accumulate count. If at least one point is visible, set object to visible
             VisibilityCheck visCheck = new VisibilityCheck();
 
-            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0)
-            {
+            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0) {
                 AxisAlignedBoundingBox aabb = sop.AxisAlignedBoundingBox;
                 if (
                     !GeometryUtility.TestPlanesAABB(
                         planes: planes,
                         bounds: new Bounds(center: aabb.center, size: aabb.size)
                     )
-                )
-                {
+                ) {
                     return visCheck;
                 }
                 Transform[] visPoints = sop.VisibilityPoints;
                 float maxDistanceSquared = maxDistance * maxDistance;
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     bool outsidePlane = false;
-                    for (int i = 0; i < planes.Length; i++)
-                    {
-                        if (!planes[i].GetSide(point.position))
-                        {
+                    for (int i = 0; i < planes.Length; i++) {
+                        if (!planes[i].GetSide(point.position)) {
                             outsidePlane = true;
                             break;
                         }
                     }
 
-                    if (outsidePlane)
-                    {
+                    if (outsidePlane) {
                         continue;
                     }
 
                     float xdelta = Math.Abs(camera.transform.position.x - point.position.x);
-                    if (xdelta > maxDistance)
-                    {
+                    if (xdelta > maxDistance) {
                         continue;
                     }
 
                     float zdelta = Math.Abs(camera.transform.position.z - point.position.z);
-                    if (zdelta > maxDistance)
-                    {
+                    if (zdelta > maxDistance) {
                         continue;
                     }
 
                     // if the object is too far above the Agent, skip
                     float ydelta = point.position.y - this.transform.position.y;
-                    if (ydelta > maxDistance)
-                    {
+                    if (ydelta > maxDistance) {
                         continue;
                     }
 
                     double distanceSquared = (xdelta * xdelta) + (zdelta * zdelta);
-                    if (distanceSquared > maxDistanceSquared)
-                    {
+                    if (distanceSquared > maxDistanceSquared) {
                         continue;
                     }
 
@@ -5161,8 +4487,7 @@ Plane[] planes
                         CheckIfVisibilityPointRaycast(sop, point, camera, false)
                         | CheckIfVisibilityPointRaycast(sop, point, camera, true)
                     );
-                    if (visCheck.visible && visCheck.interactable)
-                    {
+                    if (visCheck.visible && visCheck.interactable) {
 #if !UNITY_EDITOR
                         // If we're in the unity editor then don't break on finding a visible
                         // point as we want to draw lines to each visible point.
@@ -5176,9 +4501,7 @@ Plane[] planes
                 sop.debugIsVisible = visCheck.visible;
                 sop.debugIsInteractable = visCheck.interactable;
 #endif
-            }
-            else
-            {
+            } else {
                 Debug.Log("Error! Set at least 1 visibility point on SimObjPhysics " + sop + ".");
             }
             return visCheck;
@@ -5186,14 +4509,10 @@ Plane[] planes
 
         // pass in forceVisible bool to force grab all objects of type sim obj
         // if not, gather all visible sim objects maxVisibleDistance away from camera view
-        public SimObjPhysics[] VisibleSimObjs(bool forceVisible = false)
-        {
-            if (forceVisible)
-            {
+        public SimObjPhysics[] VisibleSimObjs(bool forceVisible = false) {
+            if (forceVisible) {
                 return GameObject.FindObjectsOfType(typeof(SimObjPhysics)) as SimObjPhysics[];
-            }
-            else
-            {
+            } else {
                 return GetAllVisibleSimObjPhysics(m_Camera, maxVisibleDistance);
             }
         }
@@ -5202,21 +4521,17 @@ protected SimObjPhysics[] GetAllVisibleSimObjPhysics(
             Camera camera,
             float maxDistance,
             IEnumerable<SimObjPhysics> filterSimObjs = null
-        )
-        {
+        ) {
             SimObjPhysics[] interactable;
 
-            if (this.visibilityScheme == VisibilityScheme.Collider)
-            {
+            if (this.visibilityScheme == VisibilityScheme.Collider) {
                 return GetAllVisibleSimObjPhysicsCollider(
                     camera,
                     maxDistance,
                     filterSimObjs,
                     out interactable
                 );
-            }
-            else
-            {
+            } else {
                 return GetAllVisibleSimObjPhysicsDistance(
                     camera,
                     maxDistance,
@@ -5231,19 +4546,15 @@ protected SimObjPhysics[] GetAllVisibleSimObjPhysics(
             float maxDistance,
             out SimObjPhysics[] interactable,
             IEnumerable<SimObjPhysics> filterSimObjs = null
-        )
-        {
-            if (this.visibilityScheme == VisibilityScheme.Collider)
-            {
+        ) {
+            if (this.visibilityScheme == VisibilityScheme.Collider) {
                 return GetAllVisibleSimObjPhysicsCollider(
                     camera,
                     maxDistance,
                     filterSimObjs,
                     out interactable
                 );
-            }
-            else
-            {
+            } else {
                 return GetAllVisibleSimObjPhysicsDistance(
                     camera,
                     maxDistance,
@@ -5253,36 +4564,27 @@ out interactable
             }
         }
 
-        protected VisibilityScheme getVisibilityScheme(string visibilityScheme = null)
-        {
+        protected VisibilityScheme getVisibilityScheme(string visibilityScheme = null) {
             VisibilityScheme visSchemeEnum;
-            if (visibilityScheme != null)
-            {
+            if (visibilityScheme != null) {
                 visibilityScheme = visibilityScheme.ToLower();
 
                 if (
                     visibilityScheme
                     == Enum.GetName(typeof(VisibilityScheme), VisibilityScheme.Collider).ToLower()
-                )
-                {
+                ) {
                     visSchemeEnum = VisibilityScheme.Collider;
-                }
-                else if (
-                    visibilityScheme
-                    == Enum.GetName(typeof(VisibilityScheme), VisibilityScheme.Distance).ToLower()
-                )
-                {
+                } else if (
+                      visibilityScheme
+                      == Enum.GetName(typeof(VisibilityScheme), VisibilityScheme.Distance).ToLower()
+                  ) {
                     visSchemeEnum = VisibilityScheme.Distance;
-                }
-                else
-                {
+                } else {
                     throw new System.NotImplementedException(
                         $"Visibility scheme {visibilityScheme} is not implemented. Must be 'distance' or 'collider'."
                     );
                 }
-            }
-            else
-            {
+            } else {
                 visSchemeEnum = this.visibilityScheme;
             }
             return visSchemeEnum;
@@ -5293,33 +4595,25 @@ public void GetVisibleObjects(
             string visibilityScheme = null,
             int? thirdPartyCameraIndex = null,
             List<string> objectIds = null
-        )
-        {
+        ) {
             VisibilityScheme visSchemeEnum = getVisibilityScheme(visibilityScheme);
 
             Camera camera;
-            if (thirdPartyCameraIndex.HasValue)
-            {
+            if (thirdPartyCameraIndex.HasValue) {
                 camera = agentManager.thirdPartyCameras[thirdPartyCameraIndex.Value];
-                if (visSchemeEnum != VisibilityScheme.Distance)
-                {
+                if (visSchemeEnum != VisibilityScheme.Distance) {
                     throw new System.NotImplementedException(
                         $"Visibility scheme {visSchemeEnum} is not implemented for third party cameras. Must be 'distance'."
                     );
                 }
-            }
-            else
-            {
+            } else {
                 camera = m_Camera;
             }
 
             List<SimObjPhysics> filterSimObjs = null;
-            if (objectIds != null)
-            {
-                foreach (string objectId in objectIds)
-                {
-                    if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-                    {
+            if (objectIds != null) {
+                foreach (string objectId in objectIds) {
+                    if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                         throw new ArgumentException(
                             $"Object with id {objectId} does not exist in scene."
                         );
@@ -5332,33 +4626,27 @@ public void GetVisibleObjects(
 
             SimObjPhysics[] interactable;
             SimObjPhysics[] visible;
-            if (visSchemeEnum == VisibilityScheme.Collider)
-            {
+            if (visSchemeEnum == VisibilityScheme.Collider) {
                 visible = GetAllVisibleSimObjPhysicsCollider(
                     camera: camera,
                     maxDistance: maxDistance.GetValueOrDefault(this.maxVisibleDistance), // lgtm [cs/dereferenced-value-may-be-null]
                     filterSimObjs: filterSimObjs,
                     interactable: out interactable
                 );
-            }
-            else if (visSchemeEnum == VisibilityScheme.Distance)
-            {
+            } else if (visSchemeEnum == VisibilityScheme.Distance) {
                 visible = GetAllVisibleSimObjPhysicsDistance(
                     camera: camera,
                     maxDistance: maxDistance.GetValueOrDefault(this.maxVisibleDistance), // lgtm [cs/dereferenced-value-may-be-null]
                     filterSimObjs: filterSimObjs,
                     interactable: out interactable
                 );
-            }
-            else
-            {
+            } else {
                 throw new System.NotImplementedException(
                     $"Visibility scheme {visSchemeEnum} is not implemented. Must be 'distance' or 'collider'."
                 );
             }
 #if UNITY_EDITOR
-            foreach (SimObjPhysics sop in visible)
-            {
+            foreach (SimObjPhysics sop in visible) {
                 Debug.Log("Visible: " + sop.name);
             }
 #endif
@@ -5367,15 +4655,13 @@ public void GetVisibleObjects(
             actionFinishedEmit(true, visible.Select(sop => sop.ObjectID).ToList());
         }
 
-        public void GetObjaverseAnnotations()
-        {
+        public void GetObjaverseAnnotations() {
             Dictionary<string, Dictionary<string, string>> annotations =
                 new Dictionary<string, Dictionary<string, string>>();
 
             foreach (
                 Thor.Objaverse.ObjaverseAnnotation oa in GameObject.FindObjectsOfType<Thor.Objaverse.ObjaverseAnnotation>()
-            )
-            {
+            ) {
                 SimObjPhysics sop = oa.gameObject.GetComponent<SimObjPhysics>();
                 annotations[sop.ObjectID] = new Dictionary<string, string>();
 
@@ -5398,8 +4684,7 @@ public void ObjectsVisibleFromThirdPartyCamera(
             int thirdPartyCameraIndex,
             float? maxDistance = null,
             string visibilityScheme = null
-        )
-        {
+        ) {
             GetVisibleObjects(
                 maxDistance: maxDistance,
                 visibilityScheme: visibilityScheme,
@@ -5417,26 +4702,21 @@ protected SimObjPhysics[] GetAllVisibleSimObjPhysicsDistance(
             float maxDistance,
             IEnumerable<SimObjPhysics> filterSimObjs,
             out SimObjPhysics[] interactable
-        )
-        {
-            if (filterSimObjs == null)
-            {
+        ) {
+            if (filterSimObjs == null) {
                 filterSimObjs = physicsSceneManager.ObjectIdToSimObjPhysics.Values;
             }
 
             List<SimObjPhysics> visible = new List<SimObjPhysics>();
             List<SimObjPhysics> interactableItems = new List<SimObjPhysics>();
             Plane[] planes = GeometryUtility.CalculateFrustumPlanes(camera);
-            foreach (var sop in filterSimObjs)
-            {
+            foreach (var sop in filterSimObjs) {
                 VisibilityCheck visCheck = isSimObjVisible(camera, sop, maxDistance, planes);
-                if (visCheck.visible)
-                {
+                if (visCheck.visible) {
                     visible.Add(sop);
                 }
 
-                if (visCheck.interactable)
-                {
+                if (visCheck.interactable) {
                     interactableItems.Add(sop);
                 }
             }
@@ -5450,8 +4730,7 @@ private SimObjPhysics[] GetAllVisibleSimObjPhysicsCollider(
             float maxDistance,
             IEnumerable<SimObjPhysics> filterSimObjs,
             out SimObjPhysics[] interactable
-        )
-        {
+        ) {
             HashSet<SimObjPhysics> currentlyVisibleItems = new HashSet<SimObjPhysics>();
             HashSet<SimObjPhysics> interactableItems = new HashSet<SimObjPhysics>();
 
@@ -5461,8 +4740,7 @@ out SimObjPhysics[] interactable
                     string,
                     SimObjPhysics
                 > pair in physicsSceneManager.ObjectIdToSimObjPhysics
-            )
-            {
+            ) {
                 // Set all objects to not be visible
                 pair.Value.debugIsVisible = false;
                 pair.Value.debugIsInteractable = false;
@@ -5470,11 +4748,9 @@ out SimObjPhysics[] interactable
 #endif
 
             HashSet<SimObjPhysics> filter = null;
-            if (filterSimObjs != null)
-            {
+            if (filterSimObjs != null) {
                 filter = new HashSet<SimObjPhysics>(filterSimObjs);
-                if (filter.Count == 0)
-                {
+                if (filter.Count == 0) {
                     interactable = interactableItems.ToArray();
                     return currentlyVisibleItems.ToArray();
                 }
@@ -5489,12 +4765,9 @@ out SimObjPhysics[] interactable
                 point1;
             float radius;
             agentCapsuleCollider.ToWorldSpaceCapsule(out point0, out point1, out radius);
-            if (point0.y <= point1.y)
-            {
+            if (point0.y <= point1.y) {
                 point1.y += maxDistance;
-            }
-            else
-            {
+            } else {
                 point0.y += maxDistance;
             }
 
@@ -5520,13 +4793,10 @@ out SimObjPhysics[] interactable
                 ),
                 QueryTriggerInteraction.Collide
             );
-            if (collidersInView != null)
-            {
-                foreach (Collider c in collidersInView)
-                {
+            if (collidersInView != null) {
+                foreach (Collider c in collidersInView) {
                     SimObjPhysics sop = ancestorSimObjPhysics(c.gameObject);
-                    if (sop != null)
-                    {
+                    if (sop != null) {
                         sopAndIncInvisibleTuples.Add((sop, false));
                     }
                 }
@@ -5543,15 +4813,11 @@ out SimObjPhysics[] interactable
                 LayerMask.GetMask("SimObjInvisible"),
                 QueryTriggerInteraction.Collide
             );
-            if (invisibleCollidersInView != null)
-            {
-                foreach (Collider c in invisibleCollidersInView)
-                {
-                    if (c.tag == "Receptacle")
-                    {
+            if (invisibleCollidersInView != null) {
+                foreach (Collider c in invisibleCollidersInView) {
+                    if (c.tag == "Receptacle") {
                         SimObjPhysics sop = c.GetComponentInParent<SimObjPhysics>();
-                        if (sop != null)
-                        {
+                        if (sop != null) {
                             sopAndIncInvisibleTuples.Add((sop, true));
                         }
                     }
@@ -5560,39 +4826,29 @@ out SimObjPhysics[] interactable
 
             // We have to explicitly add the items held by the arm as their
             // rigidbodies are set to not detect collisions
-            if (Arm != null && Arm.gameObject.activeSelf)
-            {
-                foreach (SimObjPhysics sop in Arm.heldObjects.Keys)
-                {
+            if (Arm != null && Arm.gameObject.activeSelf) {
+                foreach (SimObjPhysics sop in Arm.heldObjects.Keys) {
                     sopAndIncInvisibleTuples.Add((sop, false));
                 }
-            }
-            else if (SArm != null && SArm.gameObject.activeSelf)
-            {
-                foreach (SimObjPhysics sop in SArm.heldObjects.Keys)
-                {
+            } else if (SArm != null && SArm.gameObject.activeSelf) {
+                foreach (SimObjPhysics sop in SArm.heldObjects.Keys) {
                     sopAndIncInvisibleTuples.Add((sop, false));
                 }
             }
 
-            if (sopAndIncInvisibleTuples.Count != 0)
-            {
-                foreach ((SimObjPhysics, bool) sopAndIncInvisible in sopAndIncInvisibleTuples)
-                {
+            if (sopAndIncInvisibleTuples.Count != 0) {
+                foreach ((SimObjPhysics, bool) sopAndIncInvisible in sopAndIncInvisibleTuples) {
                     SimObjPhysics sop = sopAndIncInvisible.Item1;
                     bool includeInvisible = sopAndIncInvisible.Item2;
 
                     // now we have a reference to our sim object
-                    if (sop != null && (filter == null || filter.Contains(sop)))
-                    {
+                    if (sop != null && (filter == null || filter.Contains(sop))) {
                         // check against all visibility points, accumulate count. If at least one point is visible, set object to visible
-                        if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0)
-                        {
+                        if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0) {
                             Transform[] visPoints = sop.VisibilityPoints;
                             VisibilityCheck visCheck = new VisibilityCheck();
 
-                            foreach (Transform point in visPoints)
-                            {
+                            foreach (Transform point in visPoints) {
                                 // if this particular point is in view...
                                 // if we see at least one vis point, the object is "visible"
                                 visCheck |= CheckIfVisibilityPointInViewport(
@@ -5601,8 +4857,7 @@ out SimObjPhysics[] interactable
                                     camera,
                                     includeInvisible
                                 );
-                                if (visCheck.visible && visCheck.interactable)
-                                {
+                                if (visCheck.visible && visCheck.interactable) {
 #if !UNITY_EDITOR
                                     // If we're in the unity editor then don't break on finding a visible
                                     // point as we want to draw lines to each visible point.
@@ -5615,18 +4870,14 @@ out SimObjPhysics[] interactable
                             sop.debugIsVisible = visCheck.visible;
                             sop.debugIsInteractable = visCheck.interactable;
 #endif
-                            if (visCheck.visible && !currentlyVisibleItems.Contains(sop))
-                            {
+                            if (visCheck.visible && !currentlyVisibleItems.Contains(sop)) {
                                 currentlyVisibleItems.Add(sop);
                             }
 
-                            if (visCheck.interactable && !interactableItems.Contains(sop))
-                            {
+                            if (visCheck.interactable && !interactableItems.Contains(sop)) {
                                 interactableItems.Add(sop);
                             }
-                        }
-                        else
-                        {
+                        } else {
                             Debug.Log(
                                 "Error! Set at least 1 visibility point on SimObjPhysics "
                                     + sop
@@ -5661,8 +4912,7 @@ out SimObjPhysics[] interactable
             return currentlyVisibleItemsToList.ToArray();
         }
 
-        protected virtual LayerMask GetVisibilityRaycastLayerMask(bool withSimObjInvisible = false)
-        {
+        protected virtual LayerMask GetVisibilityRaycastLayerMask(bool withSimObjInvisible = false) {
             string[] layers = new string[]
             {
                 "SimObjVisible",
@@ -5672,8 +4922,7 @@ protected virtual LayerMask GetVisibilityRaycastLayerMask(bool withSimObjInvisib
                 "Procedural0",
                 "Agent"
             };
-            if (withSimObjInvisible)
-            {
+            if (withSimObjInvisible) {
                 layers = layers.Append("SimObjInvisible").ToArray();
             }
             return LayerMask.GetMask(layers);
@@ -5686,8 +4935,7 @@ protected VisibilityCheck CheckIfVisibilityPointRaycast(
             Vector3 position,
             Camera camera,
             bool includeInvisible
-        )
-        {
+        ) {
             VisibilityCheck visCheck = new VisibilityCheck();
             // now cast a ray out toward the point, if anything occludes this point, that point is not visible
             RaycastHit hit;
@@ -5717,8 +4965,7 @@ bool includeInvisible
 
             // check raycast against both visible and invisible layers, to check against ReceptacleTriggerBoxes which are normally
             // ignored by the other raycast
-            if (includeInvisible)
-            {
+            if (includeInvisible) {
                 if (
                     Physics.Raycast(
                         camera.transform.position,
@@ -5727,8 +4974,7 @@ bool includeInvisible
                         raycastDistance,
                         mask
                     )
-                )
-                {
+                ) {
                     if (
                         hit.transform == sop.transform
                         || (
@@ -5738,8 +4984,7 @@ bool includeInvisible
                                 || (SArm != null && SArm.heldObjects[sop].Contains(hit.collider))
                             )
                         )
-                    )
-                    {
+                    ) {
                         visCheck.visible = true;
                         visCheck.interactable = true;
 #if UNITY_EDITOR
@@ -5765,8 +5010,7 @@ bool includeInvisible
                         "Agent"
                     )
                 )
-            )
-            {
+            ) {
                 if (
                     hit.transform == sop.transform
                     || (
@@ -5776,15 +5020,12 @@ bool includeInvisible
                             || (SArm != null && SArm.heldObjects[sop].Contains(hit.collider))
                         )
                     )
-                )
-                {
+                ) {
                     // if this line is drawn, then this visibility point is in camera frame and not occluded
                     // might want to use this for a targeting check as well at some point....
                     visCheck.visible = true;
                     visCheck.interactable = true;
-                }
-                else
-                {
+                } else {
                     // we didn't directly hit the sop we are checking for with this cast,
                     // check if it's because we hit something see-through
                     SimObjPhysics hitSop = hit.transform.GetComponent<SimObjPhysics>();
@@ -5794,8 +5035,7 @@ bool includeInvisible
                         && hitSop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.CanSeeThrough
                         )
-                    )
-                    {
+                    ) {
                         // we hit something see through, so now find all objects in the path between
                         // the sop and the camera
                         RaycastHit[] hits;
@@ -5814,15 +5054,13 @@ bool includeInvisible
                         );
 
                         float[] hitDistances = new float[hits.Length];
-                        for (int i = 0; i < hitDistances.Length; i++)
-                        {
+                        for (int i = 0; i < hitDistances.Length; i++) {
                             hitDistances[i] = hits[i].distance; // Vector3.Distance(hits[i].transform.position, camera.transform.position);
                         }
 
                         Array.Sort(hitDistances, hits);
 
-                        foreach (RaycastHit h in hits)
-                        {
+                        foreach (RaycastHit h in hits) {
                             if (
                                 h.transform == sop.transform
                                 || (
@@ -5835,16 +5073,13 @@ bool includeInvisible
                                     && isSopHeldByArm
                                     && SArm.heldObjects[sop].Contains(hit.collider)
                                 )
-                            )
-                            {
+                            ) {
                                 // found the object we are looking for, great!
                                 //set it to visible via 'result' but the object is not interactable because it is behind some transparent object
                                 visCheck.visible = true;
                                 visCheck.interactable = false;
                                 break;
-                            }
-                            else
-                            {
+                            } else {
                                 // Didn't find it, continue on only if the hit object was translucent
                                 SimObjPhysics sopHitOnPath = null;
                                 sopHitOnPath = h.transform.GetComponentInParent<SimObjPhysics>();
@@ -5853,8 +5088,7 @@ bool includeInvisible
                                     || !sopHitOnPath.DoesThisObjectHaveThisSecondaryProperty(
                                         SimObjSecondaryProperty.CanSeeThrough
                                     )
-                                )
-                                {
+                                ) {
                                     break;
                                 }
                             }
@@ -5863,8 +5097,7 @@ bool includeInvisible
                 }
 
 #if UNITY_EDITOR
-                if (visCheck.visible)
-                {
+                if (visCheck.visible) {
                     Debug.DrawLine(camera.transform.position, hit.point, Color.cyan, 0f);
                 }
 #endif
@@ -5878,8 +5111,7 @@ protected VisibilityCheck CheckIfVisibilityPointRaycast(
             Transform point,
             Camera camera,
             bool includeInvisible
-        )
-        {
+        ) {
             VisibilityCheck visCheck = new VisibilityCheck();
             // now cast a ray out toward the point, if anything occludes this point, that point is not visible
             RaycastHit hit;
@@ -5902,8 +5134,7 @@ protected VisibilityCheck CheckIfVisibilityPointInViewport(
             Transform point,
             Camera camera,
             bool includeInvisible
-        )
-        {
+        ) {
             VisibilityCheck visCheck = new VisibilityCheck();
 
             Vector3 viewPoint = camera.WorldToViewportPoint(point.position);
@@ -5923,8 +5154,7 @@ bool includeInvisible
             }
 
 #if UNITY_EDITOR
-            if (visCheck.visible)
-            {
+            if (visCheck.visible) {
                 Debug.DrawLine(camera.transform.position, point.position, Color.cyan);
             }
 #endif
@@ -5932,38 +5162,31 @@ bool includeInvisible
             return visCheck;
         }
 
-        public void DefaultAgentHand()
-        {
+        public void DefaultAgentHand() {
             ResetAgentHandPosition();
             ResetAgentHandRotation();
             IsHandDefault = true;
         }
 
-        public void ResetAgentHandPosition()
-        {
+        public void ResetAgentHandPosition() {
             AgentHand.transform.position = DefaultHandPosition.transform.position;
         }
 
-        public void ResetAgentHandRotation()
-        {
+        public void ResetAgentHandRotation() {
             AgentHand.transform.rotation = this.transform.rotation;
         }
 
-        public void ApproximateAgentRadius(int n = 12)
-        {
+        public void ApproximateAgentRadius(int n = 12) {
             Quaternion oldRot = this.transform.rotation;
 
             float radius = 0.0f;
-            for (int i = 0; i < n; i++)
-            {
+            for (int i = 0; i < n; i++) {
                 this.transform.Rotate(0.0f, 360.0f / n, 0.0f);
                 Physics.SyncTransforms();
 
                 Bounds b = UtilityFunctions.CreateEmptyBounds();
-                foreach (Collider c in this.GetComponentsInChildren<Collider>())
-                {
-                    if (c.enabled && !c.isTrigger)
-                    {
+                foreach (Collider c in this.GetComponentsInChildren<Collider>()) {
+                    if (c.enabled && !c.isTrigger) {
                         b.Encapsulate(c.bounds);
                     }
                 }
@@ -5982,10 +5205,8 @@ public void ApproximateAgentRadius(int n = 12)
             actionFinishedEmit(true, radius);
         }
 
-        public void SetAgentCapsuleRadius(float radius)
-        {
-            if (radius < 0.0f)
-            {
+        public void SetAgentCapsuleRadius(float radius) {
+            if (radius < 0.0f) {
                 errorMessage = "Radius must be greater than 0.0";
                 actionFinishedEmit(false);
                 return;
@@ -5998,8 +5219,7 @@ public void SetAgentCapsuleRadius(float radius)
         }
 
         // set random seed used by unity
-        public void SetRandomSeed(int seed)
-        {
+        public void SetRandomSeed(int seed) {
             UnityEngine.Random.InitState(seed);
             systemRandom = new System.Random(seed);
             actionFinishedEmit(true);
@@ -6018,18 +5238,15 @@ public void InitialRandomSpawn(
             int numPlacementAttempts = 5,
             bool allowFloor = false,
             bool allowMoveable = false
-        )
-        {
-            if (numPlacementAttempts <= 0)
-            {
+        ) {
+            if (numPlacementAttempts <= 0) {
                 errorMessage = "numPlacementAttempts must be a positive integer.";
                 actionFinished(false);
                 return;
             }
 
             // something is in our hand AND we are trying to spawn it. Quick drop the object
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 Rigidbody rb = ItemInHand.GetComponent<Rigidbody>();
                 rb.isKinematic = false;
                 rb.constraints = RigidbodyConstraints.None;
@@ -6037,12 +5254,9 @@ public void InitialRandomSpawn(
                 rb.collisionDetectionMode = CollisionDetectionMode.ContinuousDynamic;
 
                 GameObject topObject = GameObject.Find("Objects");
-                if (topObject != null)
-                {
+                if (topObject != null) {
                     ItemInHand.transform.parent = topObject.transform;
-                }
-                else
-                {
+                } else {
                     ItemInHand.transform.parent = null;
                 }
 
@@ -6052,45 +5266,36 @@ public void InitialRandomSpawn(
             }
 
             // default excludedReceptacles if null
-            if (excludedReceptacles == null)
-            {
+            if (excludedReceptacles == null) {
                 excludedReceptacles = new String[0];
             }
 
             List<SimObjType> listOfExcludedReceptacleTypes = new List<SimObjType>();
 
             // check if strings used for excludedReceptacles are valid object types
-            foreach (string receptacleType in excludedReceptacles)
-            {
-                try
-                {
+            foreach (string receptacleType in excludedReceptacles) {
+                try {
                     SimObjType objType = (SimObjType)
                         System.Enum.Parse(typeof(SimObjType), receptacleType);
                     listOfExcludedReceptacleTypes.Add(objType);
-                }
-                catch (Exception)
-                {
+                } catch (Exception) {
                     errorMessage =
                         "invalid Object Type used in excludedReceptacles array: " + receptacleType;
                     actionFinished(false);
                     return;
                 }
             }
-            if (!allowFloor)
-            {
+            if (!allowFloor) {
                 listOfExcludedReceptacleTypes.Add(SimObjType.Floor);
             }
 
-            if (excludedObjectIds == null)
-            {
+            if (excludedObjectIds == null) {
                 excludedObjectIds = new String[0];
             }
 
             HashSet<SimObjPhysics> excludedSimObjects = new HashSet<SimObjPhysics>();
-            foreach (String objectId in excludedObjectIds)
-            {
-                if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-                {
+            foreach (String objectId in excludedObjectIds) {
+                if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                     errorMessage = "Cannot find sim object with id '" + objectId + "'";
                     actionFinished(false);
                     return;
@@ -6111,13 +5316,11 @@ public void InitialRandomSpawn(
                 allowMoveable: allowMoveable
             );
 
-            if (success && !placeStationary)
-            {
+            if (success && !placeStationary) {
                 // Let things come to rest for 2 seconds.
                 bool autoSim = Physics.autoSimulation;
                 Physics.autoSimulation = false;
-                for (int i = 0; i < 100; i++)
-                {
+                for (int i = 0; i < 100; i++) {
                     PhysicsSceneManager.PhysicsSimulateTHOR(0.02f);
                 }
                 Physics.autoSimulation = autoSim;
@@ -6125,8 +5328,7 @@ public void InitialRandomSpawn(
             physicsSceneManager.ResetObjectIdToSimObjPhysics();
 
             //update image synthesis since scene has changed
-            if (this.imageSynthesis && this.imageSynthesis.enabled)
-            {
+            if (this.imageSynthesis && this.imageSynthesis.enabled) {
                 this.imageSynthesis.OnSceneChange();
             }
 
@@ -6134,15 +5336,13 @@ public void InitialRandomSpawn(
         }
 
         // On demand public function for getting what sim objects are visible at that moment
-        public List<SimObjPhysics> GetAllVisibleSimObjPhysics(float maxDistance)
-        {
+        public List<SimObjPhysics> GetAllVisibleSimObjPhysics(float maxDistance) {
             var camera = this.GetComponentInChildren<Camera>();
             return new List<SimObjPhysics>(GetAllVisibleSimObjPhysics(camera, maxDistance));
         }
 
         // not sure what this does, maybe delete?
-        public void SetTopLevelView(bool topView = false)
-        {
+        public void SetTopLevelView(bool topView = false) {
             inTopLevelView = topView;
             actionFinished(true);
         }
@@ -6151,18 +5351,15 @@ public void SetTopLevelView(bool topView = false)
             message: "This action is deprecated. Use GetMapViewCameraProperties with a third party camera instead.",
             error: false
         )]
-        public void ToggleMapView()
-        {
+        public void ToggleMapView() {
             SyncTransform[] syncInChildren;
 
             List<StructureObject> structureObjsList = new List<StructureObject>();
             StructureObject[] structureObjs =
                 GameObject.FindObjectsOfType(typeof(StructureObject)) as StructureObject[];
 
-            foreach (StructureObject structure in structureObjs)
-            {
-                switch (structure.WhatIsMyStructureObjectTag)
-                {
+            foreach (StructureObject structure in structureObjs) {
+                switch (structure.WhatIsMyStructureObjectTag) {
                     case StructureObjectTag.Ceiling:
                     case StructureObjectTag.LightFixture:
                     case StructureObjectTag.CeilingLight:
@@ -6171,8 +5368,7 @@ public void ToggleMapView()
                 }
             }
 
-            if (inTopLevelView)
-            {
+            if (inTopLevelView) {
                 inTopLevelView = false;
                 m_Camera.orthographic = false;
                 m_Camera.transform.localPosition = lastLocalCameraPosition;
@@ -6183,25 +5379,20 @@ public void ToggleMapView()
                     .transform.GetComponent<FirstPersonCharacterCull>()
                     .StopCullingThingsForASecond = false;
                 syncInChildren = gameObject.GetComponentsInChildren<SyncTransform>();
-                foreach (SyncTransform sync in syncInChildren)
-                {
+                foreach (SyncTransform sync in syncInChildren) {
                     sync.StopSyncingForASecond = false;
                 }
 
-                foreach (StructureObject so in structureObjsList)
-                {
+                foreach (StructureObject so in structureObjsList) {
                     UpdateDisplayGameObject(so.gameObject, true);
                 }
-            }
-            else
-            {
+            } else {
                 // stop culling the agent's body so it's visible from the top?
                 m_Camera
                     .transform.GetComponent<FirstPersonCharacterCull>()
                     .StopCullingThingsForASecond = true;
                 syncInChildren = gameObject.GetComponentsInChildren<SyncTransform>();
-                foreach (SyncTransform sync in syncInChildren)
-                {
+                foreach (SyncTransform sync in syncInChildren) {
                     sync.StopSyncingForASecond = true;
                 }
 
@@ -6216,36 +5407,28 @@ public void ToggleMapView()
                 m_Camera.orthographicSize = (float)cameraProps["orthographicSize"];
                 cameraOrthSize = m_Camera.orthographicSize;
 
-                foreach (StructureObject so in structureObjsList)
-                {
+                foreach (StructureObject so in structureObjsList) {
                     UpdateDisplayGameObject(so.gameObject, false);
                 }
             }
             actionFinished(true);
         }
 
-        protected Dictionary<string, object> getMapViewCameraProperties()
-        {
+        protected Dictionary<string, object> getMapViewCameraProperties() {
             StructureObject[] structureObjs =
                 GameObject.FindObjectsOfType(typeof(StructureObject)) as StructureObject[];
 
             Bounds bounds = new Bounds();
             bool boundsDidUpdate = false;
-            if (structureObjs != null)
-            {
-                foreach (StructureObject structure in structureObjs)
-                {
+            if (structureObjs != null) {
+                foreach (StructureObject structure in structureObjs) {
                     if (
                         structure.WhatIsMyStructureObjectTag == StructureObjectTag.Ceiling
                         && structure.gameObject.name.ToLower().Contains("ceiling")
-                    )
-                    {
-                        if (!boundsDidUpdate)
-                        {
+                    ) {
+                        if (!boundsDidUpdate) {
                             bounds = structure.GetComponent<Renderer>().bounds;
-                        }
-                        else
-                        {
+                        } else {
                             Bounds b = structure.GetComponent<Renderer>().bounds;
                             bounds.Encapsulate(b);
                         }
@@ -6255,14 +5438,11 @@ protected Dictionary<string, object> getMapViewCameraProperties()
             }
 
             float yValue;
-            if (boundsDidUpdate)
-            {
+            if (boundsDidUpdate) {
                 // There's a ceiling component in the room!
                 // Let's use it's bounds. (Likely iTHOR.)
                 yValue = bounds.min.y;
-            }
-            else
-            {
+            } else {
                 // There's no component in the room!
                 // Let's use the bounds from every object. (Likely RoboTHOR.)
                 bounds = new Bounds();
@@ -6276,13 +5456,11 @@ protected Dictionary<string, object> getMapViewCameraProperties()
             // solves an edge case where the lowest point of the ceiling
             // is actually below the floor :0
             var sceneName = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
-            if (sceneName == "FloorPlan309_physics")
-            {
+            if (sceneName == "FloorPlan309_physics") {
                 yValue = 2f;
             }
 
-            return new Dictionary<string, object>()
-            {
+            return new Dictionary<string, object>() {
                 ["position"] = new Vector3(midX, yValue, midZ),
                 ["rotation"] = new Vector3(90, 0, 0),
                 ["orthographicSize"] = Math.Max(
@@ -6293,15 +5471,12 @@ protected Dictionary<string, object> getMapViewCameraProperties()
             };
         }
 
-        public void GetMapViewCameraProperties()
-        {
+        public void GetMapViewCameraProperties() {
             actionFinishedEmit(success: true, actionReturn: getMapViewCameraProperties());
         }
 
-        protected IEnumerable<Vector3> pointsOnSurfaceOfBoxCollider(BoxCollider bc, int divisions)
-        {
-            if (divisions < 2)
-            {
+        protected IEnumerable<Vector3> pointsOnSurfaceOfBoxCollider(BoxCollider bc, int divisions) {
+            if (divisions < 2) {
                 throw new ArgumentException(
                     $"divisions must be >= 2 (currently equals {divisions})."
                 );
@@ -6315,40 +5490,32 @@ protected IEnumerable<Vector3> pointsOnSurfaceOfBoxCollider(BoxCollider bc, int
             List<float> xCenterVals = new List<float>();
             List<float> yCenterVals = new List<float>();
             List<float> zCenterVals = new List<float>();
-            for (int i = 1; i < divisions - 1; i++)
-            {
+            for (int i = 1; i < divisions - 1; i++) {
                 float alpha = (2f * i / (divisions - 1f));
                 xCenterVals.Add(-halfSize.x + halfSize.x * alpha);
                 yCenterVals.Add(-halfSize.y + halfSize.y * alpha);
                 zCenterVals.Add(-halfSize.z + halfSize.z * alpha);
             }
 
-            for (int whichX = 0; whichX < 2; whichX++)
-            {
+            for (int whichX = 0; whichX < 2; whichX++) {
                 List<float> xVals = whichX == 1 ? xMinMax : xCenterVals;
 
-                for (int whichY = 0; whichY < 2; whichY++)
-                {
+                for (int whichY = 0; whichY < 2; whichY++) {
                     List<float> yVals = whichY == 1 ? yMinMax : yCenterVals;
 
-                    for (int whichZ = 0; whichZ < 2; whichZ++)
-                    {
+                    for (int whichZ = 0; whichZ < 2; whichZ++) {
                         List<float> zVals = whichZ == 1 ? zMinMax : zCenterVals;
 
-                        if (whichX + whichY + whichZ == 0)
-                        {
+                        if (whichX + whichY + whichZ == 0) {
                             continue;
                         }
 
 # if UNITY_EDITOR
                         Vector3? lastPoint = null;
 # endif
-                        foreach (float x in xVals)
-                        {
-                            foreach (float y in yVals)
-                            {
-                                foreach (float z in zVals)
-                                {
+                        foreach (float x in xVals) {
+                            foreach (float y in yVals) {
+                                foreach (float z in zVals) {
                                     Vector3 worldPoint = bc.transform.TransformPoint(
                                         bc.center + new Vector3(x, y, z)
                                     );
@@ -6370,12 +5537,10 @@ protected IEnumerable<Vector3> pointsOnSurfaceOfBoxCollider(BoxCollider bc, int
             }
         }
 
-        public void BBoxDistance(string objectId0, string objectId1, int divisions = 3)
-        {
+        public void BBoxDistance(string objectId0, string objectId1, int divisions = 3) {
             SimObjPhysics sop0 = getSimObjectFromId(objectId0);
             SimObjPhysics sop1 = getSimObjectFromId(objectId1);
-            if (sop0 == null || sop1 == null)
-            {
+            if (sop0 == null || sop1 == null) {
                 actionFinishedEmit(false); // Error message set already by getSimObjectFromId
                 return;
             }
@@ -6390,8 +5555,7 @@ public void BBoxDistance(string objectId0, string objectId1, int divisions = 3)
             // Must temporarily enable the box collider c1 as otherwise the call to `ClosestPoint` will return subtly
             // incorrect results.
             c1.enabled = true;
-            foreach (Vector3 p in pointsOnSurfaceOfBoxCollider(c0, divisions))
-            {
+            foreach (Vector3 p in pointsOnSurfaceOfBoxCollider(c0, divisions)) {
                 Vector3 pLocal = c1.transform.InverseTransformPoint(p) - c1.center;
                 Vector3 size = c1.size;
                 // 0.5 used below because `size` corresponds to full box extents, not half extents
@@ -6400,8 +5564,7 @@ public void BBoxDistance(string objectId0, string objectId1, int divisions = 3)
                     (-0.5f * size.x < pLocal.x && pLocal.x < 0.5f * size.x)
                     && (-0.5f * size.y < pLocal.y && pLocal.y < 0.5f * size.y)
                     && (-0.5f * size.z < pLocal.z && pLocal.z < 0.5f * size.z)
-                )
-                {
+                ) {
 # if UNITY_EDITOR
                     Debug.Log($"{objectId0} is inside {objectId1}, distance is 0");
 # endif
@@ -6420,16 +5583,14 @@ public void BBoxDistance(string objectId0, string objectId1, int divisions = 3)
             // Must temporarily enable the box collider c1 as otherwise the call to `ClosestPoint` will return subtly
             // incorrect results.
             c0.enabled = true;
-            foreach (Vector3 p in pointsOnSurfaceOfBoxCollider(c1, divisions))
-            {
+            foreach (Vector3 p in pointsOnSurfaceOfBoxCollider(c1, divisions)) {
                 Vector3 pLocal = c0.transform.InverseTransformPoint(p) - c0.center;
                 Vector3 size = c0.size;
                 if (
                     (-0.5f * size.x < pLocal.x && pLocal.x < 0.5f * size.x)
                     && (-0.5f * size.y < pLocal.y && pLocal.y < 0.5f * size.y)
                     && (-0.5f * size.z < pLocal.z && pLocal.z < 0.5f * size.z)
-                )
-                {
+                ) {
 # if UNITY_EDITOR
                     Debug.Log($"{objectId1} is inside {objectId0}, distance is 0");
 # endif
@@ -6451,12 +5612,10 @@ public void BBoxDistance(string objectId0, string objectId1, int divisions = 3)
             actionFinishedEmit(true, actionReturn: dist);
         }
 
-        public void CheckUnobstructedPathBetweenObjectCenters(string objectId0, string objectId1)
-        {
+        public void CheckUnobstructedPathBetweenObjectCenters(string objectId0, string objectId1) {
             SimObjPhysics sop0 = getSimObjectFromId(objectId0);
             SimObjPhysics sop1 = getSimObjectFromId(objectId1);
-            if (sop0 == null || sop1 == null)
-            {
+            if (sop0 == null || sop1 == null) {
                 actionFinishedEmit(false); // Error message set already by getSimObjectFromId
                 return;
             }
@@ -6471,12 +5630,10 @@ public void CheckUnobstructedPathBetweenObjectCenters(string objectId0, string o
             Vector3 p1 = c1.transform.TransformPoint(c1.center);
 
             HashSet<Collider> okColliders = new HashSet<Collider>();
-            foreach (Collider c in sop0.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in sop0.GetComponentsInChildren<Collider>()) {
                 okColliders.Add(c);
             }
-            foreach (Collider c in sop1.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in sop1.GetComponentsInChildren<Collider>()) {
                 okColliders.Add(c);
             }
 
@@ -6494,10 +5651,8 @@ RaycastHit hit in Physics.RaycastAll(
                     LayerMask.GetMask("SimObjVisible"),
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
-                if (!okColliders.Contains(hit.collider))
-                {
+            ) {
+                if (!okColliders.Contains(hit.collider)) {
                     SimObjPhysics hitSop = ancestorSimObjPhysics(hit.collider.gameObject);
                     string hitId =
                         (hitSop != null) ? hitSop.ObjectID : hit.collider.gameObject.name;
@@ -6531,8 +5686,7 @@ protected HashSet<string> whatObjectOn(
             int divisions,
             float belowDistance,
             bool returnOnFirstHit
-        )
-        {
+        ) {
             sop.syncBoundingBoxes(forceCreateObjectOrientedBoundingBox: true); // Ensures the sop has an object oriented bounding box attached
 
             List<Vector3> points = pointsOnSurfaceOfBoxCollider(
@@ -6546,15 +5700,12 @@ bool returnOnFirstHit
             List<Collider> collidersToDisable = sop.GetComponentsInChildren<Collider>()
                 .Where(c => c.enabled)
                 .ToList();
-            try
-            {
-                foreach (Collider c in collidersToDisable)
-                {
+            try {
+                foreach (Collider c in collidersToDisable) {
                     c.enabled = false;
                 }
 
-                for (int i = 0; i < divisions * divisions; i++)
-                { // divisions**2 as this is the number of points on a single face
+                for (int i = 0; i < divisions * divisions; i++) { // divisions**2 as this is the number of points on a single face
                     Vector3 point = points[i];
 
 # if UNITY_EDITOR
@@ -6574,14 +5725,11 @@ bool returnOnFirstHit
                             belowDistance + 1e-3f,
                             LayerMask.GetMask("SimObjVisible")
                         )
-                    )
-                    {
+                    ) {
                         SimObjPhysics onSop = ancestorSimObjPhysics(hit.collider.gameObject);
-                        if (onSop != null)
-                        {
+                        if (onSop != null) {
 # if UNITY_EDITOR
-                            if (!onObjectIds.Contains(onSop.ObjectID))
-                            {
+                            if (!onObjectIds.Contains(onSop.ObjectID)) {
                                 Debug.Log($"{sop.ObjectID} is on {onSop.ObjectID}");
                             }
 # endif
@@ -6596,11 +5744,8 @@ bool returnOnFirstHit
                         }
                     }
                 }
-            }
-            finally
-            {
-                foreach (Collider c in collidersToDisable)
-                {
+            } finally {
+                foreach (Collider c in collidersToDisable) {
                     c.enabled = true;
                 }
             }
@@ -6611,11 +5756,9 @@ public void CheckWhatObjectOn(
             string objectId,
             int divisions = 3,
             float belowDistance = 1e-2f
-        )
-        {
+        ) {
             SimObjPhysics sop = getSimObjectFromId(objectId);
-            if (sop == null)
-            {
+            if (sop == null) {
                 actionFinishedEmit(false); // Error message set already by getSimObjectFromId
                 return;
             }
@@ -6635,15 +5778,12 @@ public void CheckWhatObjectsOn(
             List<string> objectIds,
             int divisions = 3,
             float belowDistance = 1e-2f
-        )
-        {
+        ) {
             Dictionary<string, List<string>> objectIdToOnObjectId =
                 new Dictionary<string, List<string>>();
-            foreach (string objectId in objectIds)
-            {
+            foreach (string objectId in objectIds) {
                 SimObjPhysics sop = getSimObjectFromId(objectId);
-                if (sop == null)
-                {
+                if (sop == null) {
                     actionFinishedEmit(false); // Error message set already by getSimObjectFromId
                     return;
                 }
@@ -6664,15 +5804,12 @@ Get the 2D (x, z) convex hull of a GameObject. See the Get2DSemanticHulls
 
         Will return null if the input game object has no mesh vertices.
         */
-        protected List<List<float>> Get2DSemanticHull(GameObject go)
-        {
+        protected List<List<float>> Get2DSemanticHull(GameObject go) {
             List<MIConvexHull.DefaultVertex2D> vertices = new List<MIConvexHull.DefaultVertex2D>();
             float maxY = -float.PositiveInfinity;
 
-            foreach (MeshFilter meshFilter in go.GetComponentsInChildren<MeshFilter>())
-            {
-                foreach (Vector3 localVertex in meshFilter.mesh.vertices)
-                {
+            foreach (MeshFilter meshFilter in go.GetComponentsInChildren<MeshFilter>()) {
+                foreach (Vector3 localVertex in meshFilter.mesh.vertices) {
                     Vector3 globalVertex = meshFilter.transform.TransformPoint(localVertex);
                     vertices.Add(
                         new MIConvexHull.DefaultVertex2D(x: globalVertex.x, y: globalVertex.z)
@@ -6681,8 +5818,7 @@ protected List<List<float>> Get2DSemanticHull(GameObject go)
                 }
             }
 
-            if (vertices.Count == 0)
-            {
+            if (vertices.Count == 0) {
                 return null;
             }
 
@@ -6692,8 +5828,7 @@ protected List<List<float>> Get2DSemanticHull(GameObject go)
 
 #if UNITY_EDITOR
             DefaultVertex2D[] pointsOnHullArray = miconvexHull.Result.ToArray();
-            for (int i = 0; i < pointsOnHullArray.Length; i++)
-            {
+            for (int i = 0; i < pointsOnHullArray.Length; i++) {
                 DefaultVertex2D p0 = pointsOnHullArray[i];
                 DefaultVertex2D p1 = pointsOnHullArray[(i + 1) % pointsOnHullArray.Length];
                 Debug.DrawLine(
@@ -6706,8 +5841,7 @@ protected List<List<float>> Get2DSemanticHull(GameObject go)
 #endif
 
             List<List<float>> toReturn = new List<List<float>>();
-            foreach (DefaultVertex2D v in miconvexHull.Result)
-            {
+            foreach (DefaultVertex2D v in miconvexHull.Result) {
                 List<float> tuple = new List<float>();
                 tuple.Add((float)v.X);
                 tuple.Add((float)v.Y);
@@ -6733,44 +5867,36 @@ to the convex hull of the corresponding object.
         public void Get2DSemanticHulls(
             List<string> objectIds = null,
             List<string> objectTypes = null
-        )
-        {
-            if (objectIds != null && objectTypes != null)
-            {
+        ) {
+            if (objectIds != null && objectTypes != null) {
                 throw new ArgumentException(
                     "Only one of objectIds and objectTypes can have a non-null value."
                 );
             }
 
             HashSet<string> allowedObjectTypesSet = null;
-            if (objectTypes != null)
-            {
+            if (objectTypes != null) {
                 allowedObjectTypesSet = new HashSet<string>(objectTypes);
             }
 
             // Only consider sim objects which correspond to objectIds if given.
             SimObjPhysics[] sopsFilteredByObjectIds = null;
-            if (objectIds != null)
-            {
+            if (objectIds != null) {
                 sopsFilteredByObjectIds = objectIds
                     .Select(key => physicsSceneManager.ObjectIdToSimObjPhysics[key])
                     .ToArray();
-            }
-            else
-            {
+            } else {
                 sopsFilteredByObjectIds = GameObject.FindObjectsOfType<SimObjPhysics>();
             }
 
             Dictionary<string, List<List<float>>> objectIdToConvexHull =
                 new Dictionary<string, List<List<float>>>();
-            foreach (SimObjPhysics sop in sopsFilteredByObjectIds)
-            {
+            foreach (SimObjPhysics sop in sopsFilteredByObjectIds) {
                 // Skip objects that don't have one of the required types (if given)
                 if (
                     allowedObjectTypesSet != null
                     && !allowedObjectTypesSet.Contains(sop.Type.ToString())
-                )
-                {
+                ) {
                     continue;
                 }
 
@@ -6779,23 +5905,18 @@ public void Get2DSemanticHulls(
 #endif
 
                 List<List<float>> hullPoints = Get2DSemanticHull(sop.gameObject);
-                if (hullPoints != null)
-                {
+                if (hullPoints != null) {
                     objectIdToConvexHull[sop.ObjectID] = Get2DSemanticHull(sop.gameObject);
                 }
             }
             actionFinishedEmit(true, objectIdToConvexHull);
         }
 
-        public void Get2DSemanticHull(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void Get2DSemanticHull(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"No object with ID {objectId}";
                 actionFinishedEmit(false);
-            }
-            else
-            {
+            } else {
                 actionFinishedEmit(
                     true,
                     Get2DSemanticHull(
@@ -6805,24 +5926,19 @@ public void Get2DSemanticHull(string objectId)
             }
         }
 
-        public void UpdateDisplayGameObject(GameObject go, bool display)
-        {
-            if (go != null)
-            {
+        public void UpdateDisplayGameObject(GameObject go, bool display) {
+            if (go != null) {
                 foreach (
                     MeshRenderer mr in go.GetComponentsInChildren<MeshRenderer>() as MeshRenderer[]
-                )
-                {
-                    if (!initiallyDisabledRenderers.Contains(mr.GetInstanceID()))
-                    {
+                ) {
+                    if (!initiallyDisabledRenderers.Contains(mr.GetInstanceID())) {
                         mr.enabled = display;
                     }
                 }
             }
         }
 
-        public void HighlightObject(string objectId, float lineWidth = 0.095f, float? height = 2.0f)
-        {
+        public void HighlightObject(string objectId, float lineWidth = 0.095f, float? height = 2.0f) {
             SimObjPhysics sop = getSimObjectFromId(objectId: objectId);
             AxisAlignedBoundingBox bbox = sop.AxisAlignedBoundingBox;
             float minX = bbox.center.x - bbox.size.x / 2;
@@ -6830,8 +5946,7 @@ public void HighlightObject(string objectId, float lineWidth = 0.095f, float? he
             float minZ = bbox.center.z - bbox.size.z / 2;
             float maxZ = bbox.center.z + bbox.size.z / 2;
 
-            if (height == null)
-            {
+            if (height == null) {
                 height = bbox.center.y + bbox.size.y / 2;
             }
 
@@ -6855,11 +5970,9 @@ public void HighlightObject(string objectId, float lineWidth = 0.095f, float? he
         }
 
         // Hide a previously visualized path.
-        public void HideVisualizedPath(string pathName = "PathVisualization")
-        {
+        public void HideVisualizedPath(string pathName = "PathVisualization") {
             GameObject parent = GameObject.Find(pathName);
-            if (parent != null)
-            {
+            if (parent != null) {
                 // using SetActive(false) instead of Destroy
                 // since Destroy has hung the controller on
                 // occassion.
@@ -6879,29 +5992,25 @@ public void VisualizePath(
             float gridWidth = 0.045f,
             bool displayCount = false,
             string pathName = "PathVisualization"
-        )
-        {
+        ) {
             // We do not have multiple path visualizations at the same time
             // by default. This is because we often want to override it
             // instead of have multiple of them. You can have multiple of them
             // by changing the pathName parameter.
 
             var path = positions;
-            if (path == null || path.Count() == 0)
-            {
+            if (path == null || path.Count() == 0) {
                 throw new ArgumentException("Path cannot be null or empty.");
             }
 
-            if (grid)
-            {
+            if (grid) {
                 getReachablePositions(visualize: grid, gridColor: gridColor, gridWidth: gridWidth);
             }
 
             GameObject parent = GameObject.Find(pathName);
             GameObject go;
             GameObject endGo;
-            if (parent == null)
-            {
+            if (parent == null) {
                 parent = new GameObject(pathName);
                 endGo = Instantiate(
                     DebugTargetPointPrefab,
@@ -6910,41 +6019,34 @@ public void VisualizePath(
                 );
                 endGo.name = "End";
                 endGo.transform.parent = parent.transform;
-                if (endText != null)
-                {
+                if (endText != null) {
                     endGo.GetComponentInChildren<TextMesh>().text = endText;
                 }
 
                 go = Instantiate(DebugPointPrefab, path[0], Quaternion.identity);
                 go.name = "Start";
                 go.transform.parent = parent.transform;
-                if (startText != null)
-                {
+                if (startText != null) {
                     go.GetComponentInChildren<TextMesh>().text = startText;
                 }
-            }
-            else
-            {
+            } else {
                 parent.SetActive(true);
                 endGo = parent.transform.Find("End").gameObject;
                 endGo.transform.position = path[path.Count() - 1];
-                if (endText != null)
-                {
+                if (endText != null) {
                     endGo.GetComponentInChildren<TextMesh>().text = endText;
                 }
 
                 go = parent.transform.Find("Start").gameObject;
                 go.transform.position = path[0];
-                if (startText != null)
-                {
+                if (startText != null) {
                     go.GetComponentInChildren<TextMesh>().text = startText;
                 }
             }
 
             var lineRenderer = go.GetComponentInChildren<LineRenderer>();
 
-            if (pathGradient != null && pathGradient.colorKeys.Length > 0)
-            {
+            if (pathGradient != null && pathGradient.colorKeys.Length > 0) {
                 lineRenderer.colorGradient = pathGradient;
             }
 
@@ -6956,14 +6058,12 @@ public void VisualizePath(
         }
 
         // this one is used for in-editor debug draw, currently calls to this are commented out
-        private void VisualizePath(Vector3 startPosition, NavMeshPath path)
-        {
+        private void VisualizePath(Vector3 startPosition, NavMeshPath path) {
             var pathDistance = 0.0;
 #if UNITY_EDITOR
             Debug.Log($"Visualize Path, corner lenght: {path.corners.Length}");
 #endif
-            for (int i = 0; i < path.corners.Length - 1; i++)
-            {
+            for (int i = 0; i < path.corners.Length - 1; i++) {
                 Debug.DrawLine(path.corners[i], path.corners[i + 1], Color.red, 5.0f);
 #if UNITY_EDITOR
                 Debug.Log(
@@ -6973,8 +6073,7 @@ private void VisualizePath(Vector3 startPosition, NavMeshPath path)
                 pathDistance += Vector3.Distance(path.corners[i], path.corners[i + 1]);
             }
 
-            if (pathDistance > 0.0001)
-            {
+            if (pathDistance > 0.0001) {
                 // Better way to draw spheres
                 var go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
                 go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
@@ -6983,50 +6082,38 @@ private void VisualizePath(Vector3 startPosition, NavMeshPath path)
             }
         }
 
-        private string[] objectTypeToObjectIds(string objectTypeString)
-        {
+        private string[] objectTypeToObjectIds(string objectTypeString) {
             List<string> objectIds = new List<string>();
-            try
-            {
+            try {
                 SimObjType objectType = (SimObjType)
                     Enum.Parse(
                         typeof(SimObjType),
                         objectTypeString.Replace(" ", String.Empty),
                         true
                     );
-                foreach (var s in physicsSceneManager.ObjectIdToSimObjPhysics)
-                {
-                    if (s.Value.ObjType == objectType)
-                    {
+                foreach (var s in physicsSceneManager.ObjectIdToSimObjPhysics) {
+                    if (s.Value.ObjType == objectType) {
                         objectIds.Add(s.Value.objectID);
                     }
                 }
-            }
-            catch (ArgumentException exception)
-            {
+            } catch (ArgumentException exception) {
                 Debug.Log(exception);
             }
             return objectIds.ToArray();
         }
 
-        public void ObjectTypeToObjectIds(string objectType)
-        {
-            try
-            {
+        public void ObjectTypeToObjectIds(string objectType) {
+            try {
                 var objectIds = objectTypeToObjectIds(objectType);
                 actionFinished(true, objectIds.ToArray());
-            }
-            catch (ArgumentException exception)
-            {
+            } catch (ArgumentException exception) {
                 errorMessage = "Invalid object type '" + objectType + "'. " + exception.Message;
                 actionFinished(false);
             }
         }
 
-        protected SimObjPhysics getSimObjectFromId(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        protected SimObjPhysics getSimObjectFromId(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = "Cannot find sim object with id '" + objectId + "'";
                 return null;
             }
@@ -7036,19 +6123,14 @@ protected SimObjPhysics getSimObjectFromId(string objectId)
             return sop;
         }
 
-        private SimObjPhysics getSimObjectFromTypeOrId(string objectType, string objectId)
-        {
-            if (!String.IsNullOrEmpty(objectType) && String.IsNullOrEmpty(objectId))
-            {
+        private SimObjPhysics getSimObjectFromTypeOrId(string objectType, string objectId) {
+            if (!String.IsNullOrEmpty(objectType) && String.IsNullOrEmpty(objectId)) {
                 var ids = objectTypeToObjectIds(objectType);
-                if (ids.Length == 0)
-                {
+                if (ids.Length == 0) {
                     throw new ArgumentException(
                         $"Object type {objectType} was not found in the scene."
                     );
-                }
-                else if (ids.Length > 1)
-                {
+                } else if (ids.Length > 1) {
                     throw new ArgumentException(
                         $"Multiple objects of type {objectType} were found in the scene, cannot disambiguate."
                     );
@@ -7057,29 +6139,25 @@ private SimObjPhysics getSimObjectFromTypeOrId(string objectType, string objectI
                 objectId = ids[0];
             }
 
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 throw new ArgumentException($"Cannot find sim object with id {objectId}");
             }
 
             SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
-            if (sop == null)
-            {
+            if (sop == null) {
                 throw new ArgumentException($"Object with id {objectId} is null");
             }
 
             return sop;
         }
 
-        private SimObjPhysics getSimObjectFromTypeOrId(ServerAction action)
-        {
+        private SimObjPhysics getSimObjectFromTypeOrId(ServerAction action) {
             var objectId = action.objectId;
             var objectType = action.objectType;
             return getSimObjectFromTypeOrId(objectType, objectId);
         }
 
-        public void VisualizeGrid()
-        {
+        public void VisualizeGrid() {
             var reachablePositions = getReachablePositions(1.0f, 10000, true);
             actionFinished(true, reachablePositions);
         }
@@ -7090,18 +6168,14 @@ public string objectNavExpertAction(
             Vector3? position = null,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             NavMeshPath path = new UnityEngine.AI.NavMeshPath();
             Func<bool> visibilityTest;
-            if (!String.IsNullOrEmpty(objectType) || !String.IsNullOrEmpty(objectId))
-            {
+            if (!String.IsNullOrEmpty(objectType) || !String.IsNullOrEmpty(objectId)) {
                 SimObjPhysics sop = getSimObjectFromTypeOrId(objectType, objectId);
                 path = getShortestPath(sop, true, navMeshIds: navMeshIds);
                 visibilityTest = () => objectIsWithinViewport(sop);
-            }
-            else
-            {
+            } else {
                 var startPosition = this.transform.position;
                 var startRotation = this.transform.rotation;
                 SafelyComputeFirstNavMeshPath(
@@ -7115,11 +6189,9 @@ public string objectNavExpertAction(
                 visibilityTest = () => true;
             }
 
-            if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete)
-            {
+            if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete) {
                 int parts = (int)Math.Round(360f / rotateStepDegrees);
-                if (Math.Abs((parts * 1.0f) - 360f / rotateStepDegrees) > 1e-5)
-                {
+                if (Math.Abs((parts * 1.0f) - 360f / rotateStepDegrees) > 1e-5) {
                     errorMessage =
                         "Invalid rotate step degrees for agent, must divide 360 without a remainder.";
                     return null;
@@ -7130,32 +6202,26 @@ public string objectNavExpertAction(
                 Quaternion startRotation = this.transform.rotation;
                 Vector3 startCameraRot = m_Camera.transform.localEulerAngles;
 
-                if (path.corners.Length <= 1)
-                {
-                    if (visibilityTest())
-                    {
+                if (path.corners.Length <= 1) {
+                    if (visibilityTest()) {
                         return null;
                     }
 
                     int relRotate = 0;
                     int relHorizon = 0;
                     int bestNumActions = 1000000;
-                    for (int i = -numLeft; i <= numRight; i++)
-                    {
+                    for (int i = -numLeft; i <= numRight; i++) {
                         transform.Rotate(0.0f, i * rotateStepDegrees, 0.0f);
-                        for (int horizon = -1; horizon <= 2; horizon++)
-                        {
+                        for (int horizon = -1; horizon <= 2; horizon++) {
                             m_Camera.transform.localEulerAngles = new Vector3(
                                 30f * horizon,
                                 0.0f,
                                 0.0f
                             );
-                            if (visibilityTest())
-                            {
+                            if (visibilityTest()) {
                                 int numActions =
                                     Math.Abs(i) + Math.Abs(horizon - (int)(startCameraRot.x / 30f));
-                                if (numActions < bestNumActions)
-                                {
+                                if (numActions < bestNumActions) {
                                     bestNumActions = numActions;
                                     relRotate = i;
                                     relHorizon = horizon - (int)(startCameraRot.x / 30f);
@@ -7175,30 +6241,19 @@ public string objectNavExpertAction(
                     //transform.Rotate(0.0f, relRotate * rotateStepDegrees, 0.0f);
 #endif
 
-                    if (relRotate != 0)
-                    {
-                        if (relRotate < 0)
-                        {
+                    if (relRotate != 0) {
+                        if (relRotate < 0) {
                             return "RotateLeft";
-                        }
-                        else
-                        {
+                        } else {
                             return "RotateRight";
                         }
-                    }
-                    else if (relHorizon != 0)
-                    {
-                        if (relHorizon < 0)
-                        {
+                    } else if (relHorizon != 0) {
+                        if (relHorizon < 0) {
                             return "LookUp";
-                        }
-                        else
-                        {
+                        } else {
                             return "LookDown";
                         }
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = "Object doesn't seem visible from any rotation/horizon.";
                     }
                     return null;
@@ -7209,33 +6264,27 @@ public string objectNavExpertAction(
                 int whichBest = 0;
                 float bestDistance = 1000f;
                 string errorMessages = "";
-                for (int i = -numLeft; i <= numRight; i++)
-                {
+                for (int i = -numLeft; i <= numRight; i++) {
                     transform.Rotate(0.0f, i * rotateStepDegrees, 0.0f);
                     Physics.SyncTransforms();
 
                     bool couldMove = moveInDirection(this.transform.forward * gridSize);
-                    if (couldMove)
-                    {
+                    if (couldMove) {
                         float newDistance =
                             Math.Abs(nextCorner.x - transform.position.x)
                             + Math.Abs(nextCorner.z - transform.position.z);
-                        if (newDistance + 1e-6 < bestDistance)
-                        {
+                        if (newDistance + 1e-6 < bestDistance) {
                             bestDistance = newDistance;
                             whichBest = i;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         errorMessages = errorMessages + " " + errorMessage;
                     }
                     transform.position = startPosition;
                     transform.rotation = startRotation;
                 }
 
-                if (bestDistance >= 1000f)
-                {
+                if (bestDistance >= 1000f) {
                     errorMessage =
                         "Can't seem to move in any direction. Error messages: " + errorMessages;
                     return null;
@@ -7249,21 +6298,14 @@ public string objectNavExpertAction(
                 Debug.Log(whichBest);
 #endif
 
-                if (whichBest < 0)
-                {
+                if (whichBest < 0) {
                     return "RotateLeft";
-                }
-                else if (whichBest > 0)
-                {
+                } else if (whichBest > 0) {
                     return "RotateRight";
-                }
-                else
-                {
+                } else {
                     return "MoveAhead";
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "Path to target could not be found";
                 return null;
             }
@@ -7274,8 +6316,7 @@ public void ObjectNavExpertAction(
             string objectType = null,
             Vector3? position = null,
             IEnumerable<int> navMeshIds = null
-        )
-        {
+        ) {
             string action = objectNavExpertAction(
                 objectId,
                 objectType,
@@ -7283,13 +6324,10 @@ public void ObjectNavExpertAction(
                 navMeshIds: navMeshIds
             );
 
-            if (action != null)
-            {
+            if (action != null) {
                 actionFinished(true, action);
                 return;
-            }
-            else
-            {
+            } else {
                 actionFinished(false);
                 return;
             }
@@ -7301,12 +6339,10 @@ public UnityEngine.AI.NavMeshPath getShortestPath(
             ServerAction action = null,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             var startPosition = this.transform.position;
             var startRotation = this.transform.rotation;
-            if (!useAgentTransform)
-            {
+            if (!useAgentTransform) {
                 startPosition = action.position;
                 startRotation = Quaternion.Euler(action.rotation);
             }
@@ -7321,6 +6357,28 @@ public UnityEngine.AI.NavMeshPath getShortestPath(
             );
         }
 
+        private void getShortestPath(
+            string objectType,
+            string objectId,
+            Vector3 startPosition,
+            IEnumerable<Quaternion> startRotations,
+            float allowedError,
+            IEnumerable<int> navMeshIds = null,
+            bool sampleFromNavmesh = true
+        ) {
+            SimObjPhysics sop = getSimObjectFromTypeOrId(objectType, objectId);
+            var path = GetSimObjectNavMeshTargets(
+                sop,
+                startPosition,
+                startRotations,
+                allowedError,
+                navMeshIds: navMeshIds,
+                sampleFromNavmesh: sampleFromNavmesh
+            );
+            // VisualizePath(startPosition, path);
+            actionFinishedEmit(success: true, actionReturn: path);
+        }
+
         private void getShortestPath(
             string objectType,
             string objectId,
@@ -7329,8 +6387,7 @@ private void getShortestPath(
             float allowedError,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             SimObjPhysics sop = getSimObjectFromTypeOrId(objectType, objectId);
             var path = GetSimObjectNavMeshTarget(
                 sop,
@@ -7352,8 +6409,7 @@ public void GetShortestPath(
             float allowedError = DefaultAllowedErrorInShortestPath,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             getShortestPath(
                 objectType: objectType,
                 objectId: objectId,
@@ -7365,6 +6421,26 @@ public void GetShortestPath(
             );
         }
 
+        public void GetShortestPath(
+            Vector3 position,
+            List<Vector3> rotations,
+            string objectType = null,
+            string objectId = null,
+            float allowedError = DefaultAllowedErrorInShortestPath,
+            IEnumerable<int> navMeshIds = null,
+            bool sampleFromNavmesh = true
+        ) {
+            getShortestPath(
+                objectType: objectType,
+                objectId: objectId,
+                startPosition: position,
+                startRotations: rotations.Select(r => Quaternion.Euler(r)),
+                allowedError: allowedError,
+                navMeshIds: navMeshIds,
+                sampleFromNavmesh: sampleFromNavmesh
+            );
+        }
+
         // public void GetShortestPathNew(
         //     Vector3 position,
         //     Vector3 rotation,
@@ -7393,14 +6469,13 @@ public void GetShortestPath(
             float allowedError = DefaultAllowedErrorInShortestPath,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             // this.transform.position = new Vector3(this.transform.position.x, 0.01f, this.transform.position.z);
             getShortestPath(
                 objectType,
                 objectId,
                 position,
-                Quaternion.Euler(Vector3.zero),
+                Quaternion.identity,
                 allowedError,
                 navMeshIds,
                 sampleFromNavmesh: sampleFromNavmesh
@@ -7413,8 +6488,7 @@ public void GetShortestPath(
             float allowedError = DefaultAllowedErrorInShortestPath,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             getShortestPath(
                 objectType,
                 objectId,
@@ -7432,19 +6506,16 @@ private bool GetPathFromReachablePositions(
             Transform agentTransform,
             string targetSimObjectId,
             UnityEngine.AI.NavMeshPath path
-        )
-        {
+        ) {
             Vector3 fixedPosition = new Vector3(float.MinValue, float.MinValue, float.MinValue);
             // bool success = false;
             var PhysicsController = this;
             var targetSOP = getSimObjectFromId(targetSimObjectId);
-            foreach (var pos in sortedPositions)
-            {
+            foreach (var pos in sortedPositions) {
                 agentTransform.position = pos;
                 agentTransform.LookAt(targetPosition);
 
-                if (IsInteractable(targetSOP))
-                {
+                if (IsInteractable(targetSOP)) {
                     fixedPosition = pos;
                     // success = true;
                     break;
@@ -7465,8 +6536,7 @@ protected Collider[] overlapCollider(
             Vector3 newCenter,
             float rotateBy,
             int layerMask
-        )
-        {
+        ) {
             Vector3 center,
                 halfExtents;
             Quaternion orientation;
@@ -7486,8 +6556,7 @@ protected Collider[] overlapCollider(
             SphereCollider sphere,
             Vector3 newCenter,
             int layerMask
-        )
-        {
+        ) {
             Vector3 center;
             float radius;
             sphere.ToWorldSpaceSphere(out center, out radius);
@@ -7504,8 +6573,7 @@ protected Collider[] overlapCollider(
             Vector3 newCenter,
             float rotateBy,
             int layerMask
-        )
-        {
+        ) {
             Vector3 point0,
                 point1;
             float radius;
@@ -7530,10 +6598,8 @@ int layerMask
             );
         }
 
-        protected bool handObjectCanFitInPosition(Vector3 newAgentPosition, float rotation)
-        {
-            if (ItemInHand == null)
-            {
+        protected bool handObjectCanFitInPosition(Vector3 newAgentPosition, float rotation) {
+            if (ItemInHand == null) {
                 return true;
             }
 
@@ -7552,34 +6618,25 @@ protected bool handObjectCanFitInPosition(Vector3 newAgentPosition, float rotati
                 "Procedural3",
                 "Procedural0"
             );
-            foreach (CapsuleCollider cc in soInHand.GetComponentsInChildren<CapsuleCollider>())
-            {
-                foreach (Collider c in overlapCollider(cc, newHandPosition, rotation, layerMask))
-                {
-                    if (!hasAncestor(c.transform.gameObject, gameObject))
-                    {
+            foreach (CapsuleCollider cc in soInHand.GetComponentsInChildren<CapsuleCollider>()) {
+                foreach (Collider c in overlapCollider(cc, newHandPosition, rotation, layerMask)) {
+                    if (!hasAncestor(c.transform.gameObject, gameObject)) {
                         return false;
                     }
                 }
             }
 
-            foreach (BoxCollider bc in soInHand.GetComponentsInChildren<BoxCollider>())
-            {
-                foreach (Collider c in overlapCollider(bc, newHandPosition, rotation, layerMask))
-                {
-                    if (!hasAncestor(c.transform.gameObject, gameObject))
-                    {
+            foreach (BoxCollider bc in soInHand.GetComponentsInChildren<BoxCollider>()) {
+                foreach (Collider c in overlapCollider(bc, newHandPosition, rotation, layerMask)) {
+                    if (!hasAncestor(c.transform.gameObject, gameObject)) {
                         return false;
                     }
                 }
             }
 
-            foreach (SphereCollider sc in soInHand.GetComponentsInChildren<SphereCollider>())
-            {
-                foreach (Collider c in overlapCollider(sc, newHandPosition, layerMask))
-                {
-                    if (!hasAncestor(c.transform.gameObject, gameObject))
-                    {
+            foreach (SphereCollider sc in soInHand.GetComponentsInChildren<SphereCollider>()) {
+                foreach (Collider c in overlapCollider(sc, newHandPosition, layerMask)) {
+                    if (!hasAncestor(c.transform.gameObject, gameObject)) {
                         return false;
                     }
                 }
@@ -7597,8 +6654,7 @@ public RaycastHit[] capsuleCastAllForAgent(
             Vector3 dir,
             float moveMagnitude,
             int layerMask
-        )
-        {
+        ) {
             // make sure to offset this by capsuleCollider.center since we adjust the capsule size vertically, and in some cases horizontally
             Vector3 startPositionCapsuleCenter =
                 startPosition + capsule.transform.TransformDirection(capsule.center);
@@ -7623,8 +6679,7 @@ int layerMask
         protected bool isAgentCapsuleColliding(
             HashSet<Collider> collidersToIgnore = null,
             bool includeErrorMessage = false
-        )
-        {
+        ) {
             int layerMask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -7638,23 +6693,17 @@ Collider c in PhysicsExtensions.OverlapCapsule(
                     layerMask,
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 if (
                     (!hasAncestor(c.transform.gameObject, gameObject))
                     && (collidersToIgnore == null || !collidersToIgnoreDuringMovement.Contains(c))
-                )
-                {
-                    if (includeErrorMessage)
-                    {
+                ) {
+                    if (includeErrorMessage) {
                         SimObjPhysics sop = ancestorSimObjPhysics(c.gameObject);
                         String collidedWithName;
-                        if (sop != null)
-                        {
+                        if (sop != null) {
                             collidedWithName = sop.ObjectID;
-                        }
-                        else
-                        {
+                        } else {
                             collidedWithName = c.gameObject.name;
                         }
                         errorMessage = $"Collided with: {collidedWithName}.";
@@ -7674,8 +6723,7 @@ protected bool isAgentBoxColliding(
             Transform transformWithBoxCollider,
             HashSet<Collider> collidersToIgnore = null,
             bool includeErrorMessage = false
-        )
-        {
+        ) {
             int layerMask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -7689,23 +6737,17 @@ Collider c in PhysicsExtensions.OverlapBox(
                     layerMask,
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
+            ) {
                 if (
                     (!hasAncestor(c.transform.gameObject, gameObject))
                     && (collidersToIgnore == null || !collidersToIgnoreDuringMovement.Contains(c))
-                )
-                {
-                    if (includeErrorMessage)
-                    {
+                ) {
+                    if (includeErrorMessage) {
                         SimObjPhysics sop = ancestorSimObjPhysics(c.gameObject);
                         String collidedWithName;
-                        if (sop != null)
-                        {
+                        if (sop != null) {
                             collidedWithName = sop.ObjectID;
-                        }
-                        else
-                        {
+                        } else {
                             collidedWithName = c.gameObject.name;
                         }
                         errorMessage = $"Collided with: {collidedWithName}.";
@@ -7721,8 +6763,7 @@ Collider c in PhysicsExtensions.OverlapBox(
             return false;
         }
 
-        protected Collider[] objectsCollidingWithAgent()
-        {
+        protected Collider[] objectsCollidingWithAgent() {
             int layerMask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -7744,8 +6785,7 @@ public virtual RaycastHit[] CastBodyTrayectory(
             float moveMagnitude,
             int layerMask,
             CapsuleData cachedCapsule
-        )
-        {
+        ) {
             return capsuleCastAllForAgent(
                 capsule: cachedCapsule,
                 skinWidth: skinWidth,
@@ -7761,8 +6801,7 @@ public bool getReachablePositionToObjectVisible(
             out Vector3 pos,
             float gridMultiplier = 1.0f,
             int maxStepCount = 10000
-        )
-        {
+        ) {
             var capsule = GetAgentCapsule();
             float sw = m_CharacterController.skinWidth;
             Queue<Vector3> pointsQueue = new Queue<Vector3>();
@@ -7785,26 +6824,29 @@ public bool getReachablePositionToObjectVisible(
                 "Procedural3",
                 "Procedural0"
             );
+
+            var rotations = new List<float> { 0.0f, 90.0f, 180.0f, 270f }; //, 180.0f, 360f};
             int stepsTaken = 0;
             pos = Vector3.negativeInfinity;
-            while (pointsQueue.Count != 0)
-            {
+            while (pointsQueue.Count != 0) {
                 stepsTaken += 1;
                 Vector3 p = pointsQueue.Dequeue();
-                if (!goodPoints.Contains(p))
-                {
+
+                if (!goodPoints.Contains(p)) {
+                    var preRotation = transform.rotation;
+                    // foreach (var rotation in rotations) {
                     goodPoints.Add(p);
                     transform.position = p;
                     var rot = transform.rotation;
+                    // transform.rotation = Quaternion.Euler(new Vector3(0.0f, rotation, 0.0f));
                     // make sure to rotate just the Camera, not the whole agent
                     m_Camera.transform.LookAt(targetSOP.transform, transform.up);
 
                     bool isVisible = IsInteractable(targetSOP);
 
-                    transform.rotation = rot;
+                    // transform.rotation = rot;
 
-                    if (isVisible)
-                    {
+                    if (isVisible) {
                         pos = p;
                         return true;
                     }
@@ -7812,11 +6854,9 @@ public bool getReachablePositionToObjectVisible(
                     HashSet<Collider> objectsAlreadyColliding = new HashSet<Collider>(
                         objectsCollidingWithAgent()
                     );
-                    foreach (Vector3 d in directions)
-                    {
+                    foreach (Vector3 d in directions) {
                         Vector3 newPosition = p + d * gridSize * gridMultiplier;
-                        if (seenPoints.Contains(newPosition))
-                        {
+                        if (seenPoints.Contains(newPosition)) {
                             continue;
                         }
                         seenPoints.Add(newPosition);
@@ -7831,29 +6871,25 @@ public bool getReachablePositionToObjectVisible(
                         );
 
                         bool shouldEnqueue = true;
-                        foreach (RaycastHit hit in hits)
-                        {
+                        foreach (RaycastHit hit in hits) {
                             if (
                                 !ancestorHasName(hit.transform.gameObject, "Floor")
                                 &&
                                 // hit.transform.gameObject.name != "Floor" && // Dont know why this worked on procedural
                                 !ancestorHasName(hit.transform.gameObject, "FPSController")
                                 && !objectsAlreadyColliding.Contains(hit.collider)
-                            )
-                            {
+                            ) {
                                 shouldEnqueue = false;
                                 break;
                             }
                         }
 
-                        if (!shouldEnqueue)
-                        {
+                        if (!shouldEnqueue) {
                             continue;
                         }
 
                         bool inBounds = agentManager.SceneBounds.Contains(newPosition);
-                        if (errorMessage == "" && !inBounds)
-                        {
+                        if (errorMessage == "" && !inBounds) {
                             errorMessage =
                                 "In "
                                 + UnityEngine.SceneManagement.SceneManager.GetActiveScene().name
@@ -7871,20 +6907,20 @@ public bool getReachablePositionToObjectVisible(
                                 || handObjectCanFitInPosition(newPosition, 180.0f)
                                 || handObjectCanFitInPosition(newPosition, 270.0f)
                             );
-                        if (shouldEnqueue)
-                        {
+                        if (shouldEnqueue) {
                             pointsQueue.Enqueue(newPosition);
 #if UNITY_EDITOR
-                            Debug.DrawLine(p, newPosition, Color.cyan, 100000f);
+                            Debug.DrawLine(p, newPosition, Color.green, 100000f);
 #endif
 #if UNITY_EDITOR
-                            Debug.DrawLine(p, newPosition, Color.cyan, 10f);
+                            // Debug.DrawLine(p, newPosition, Color.cyan, 10f);
 #endif
                         }
                     }
+                    // }
+                    // transform.rotation = preRotation;
                 }
-                if (stepsTaken > Math.Floor(maxStepCount / (gridSize * gridSize)))
-                {
+                if (stepsTaken > Math.Floor(maxStepCount / (gridSize * gridSize))) {
                     throw new InvalidOperationException(
                         "Too many steps taken in GetReachablePositions!"
                     );
@@ -7899,6 +6935,43 @@ public bool getReachablePositionToObjectVisible(
             return false;
         }
 
+        private UnityEngine.AI.NavMeshPath GetSimObjectNavMeshTargets(
+            SimObjPhysics targetSOP,
+            Vector3 initialPosition,
+            IEnumerable<Quaternion> initialRotations,
+            float allowedError,
+            bool visualize = false,
+            IEnumerable<int> navMeshIds = null,
+            bool sampleFromNavmesh = true
+        ) {
+            var path = new UnityEngine.AI.NavMeshPath();
+            InvalidOperationException lastException = null;
+            foreach (var rotation in initialRotations) {
+                lastException = null;
+                try {
+                    path = GetSimObjectNavMeshTarget(
+                        targetSOP: targetSOP,
+                        initialPosition: initialPosition,
+                        initialRotation: rotation,
+                        allowedError: allowedError,
+                        visualize: visualize,
+                        navMeshIds: navMeshIds,
+                        sampleFromNavmesh: sampleFromNavmesh
+                    );
+                } catch (InvalidOperationException e) {
+                    lastException = e;
+                }
+
+                if (path.status == NavMeshPathStatus.PathComplete) {
+                    return path;
+                }
+            }
+            if (lastException != null) {
+                throw lastException;
+            }
+            return path;
+        }
+
         private UnityEngine.AI.NavMeshPath GetSimObjectNavMeshTarget(
             SimObjPhysics targetSOP,
             Vector3 initialPosition,
@@ -7907,8 +6980,7 @@ private UnityEngine.AI.NavMeshPath GetSimObjectNavMeshTarget(
             bool visualize = false,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             var targetTransform = targetSOP.transform;
             var targetSimObject = targetTransform.GetComponentInChildren<SimObjPhysics>();
             var agentTransform = this.transform;
@@ -7931,8 +7003,7 @@ out fixedPosition
             agentTransform.rotation = originalAgentRotation;
             m_Camera.transform.rotation = originalCameraRotation;
 
-            if (!wasObjectVisible)
-            {
+            if (!wasObjectVisible) {
                 throw new InvalidOperationException(
                     $"Target object {targetSOP.objectID} is not visible on navigation path given current agent parameters: maxVisibleDistance ({maxVisibleDistance}), gridSize ({gridSize}), fieldOfView ({m_Camera.fieldOfView}), camera width ({Screen.width}), camera height ({Screen.height})"
                 );
@@ -7951,8 +7022,7 @@ out fixedPosition
             );
 
             var pathDistance = 0.0f;
-            for (int i = 0; i < path.corners.Length - 1; i++)
-            {
+            for (int i = 0; i < path.corners.Length - 1; i++) {
 #if UNITY_EDITOR
                 Debug.DrawLine(path.corners[i], path.corners[i + 1], Color.red, 10.0f);
                 Debug.Log("Corner " + i + ": " + path.corners[i]);
@@ -7962,15 +7032,13 @@ out fixedPosition
             return path;
         }
 
-        protected float getFloorY(float x, float start_y, float z)
-        {
+        protected float getFloorY(float x, float start_y, float z) {
             int layerMask = ~LayerMask.GetMask("Agent", "SimObjInvisible");
             float y = start_y;
 
             RaycastHit hit;
             Ray ray = new Ray(new Vector3(x, y, z), -transform.up);
-            if (!Physics.Raycast(ray, out hit, 100f, layerMask))
-            {
+            if (!Physics.Raycast(ray, out hit, 100f, layerMask)) {
                 throw new InvalidOperationException(
                     $"Raycast could not find the floor from position: {x},{start_y},{z}"
                 );
@@ -7978,14 +7046,12 @@ protected float getFloorY(float x, float start_y, float z)
             return hit.point.y;
         }
 
-        protected float getFloorY(float x, float z)
-        {
+        protected float getFloorY(float x, float z) {
             int layerMask = ~LayerMask.GetMask("Agent");
 
             Ray ray = new Ray(transform.position, -transform.up);
             RaycastHit hit;
-            if (!Physics.Raycast(ray, out hit, 10f, layerMask))
-            {
+            if (!Physics.Raycast(ray, out hit, 10f, layerMask)) {
                 errorMessage = "Could not find the floor";
                 return float.NegativeInfinity;
             }
@@ -8000,15 +7066,13 @@ protected void SafelyComputeFirstNavMeshPath(
             IEnumerable<int> navMeshIds,
             string debugTargetObjectId = "",
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             var navMeshAgent = this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>();
             var navmeshSurfaces = GameObject.FindObjectsOfType<NavMeshSurfaceExtended>();
             // Debug.Log($"---NavMeshSurfaceExtended size {navmeshSurfaces.Count()}");
             //  Debug.Log($"---NavMeshSurface size {GameObject.FindObjectsOfType<NavMeshSurface>().Count()}");
             var defaultNavmeshIds = new List<int?>() { null };
-            if (navmeshSurfaces.Count() > 0)
-            {
+            if (navmeshSurfaces.Count() > 0) {
                 defaultNavmeshIds = new List<int?>()
                 {
                     NavMeshSurfaceExtended.activeSurfaces[0].agentTypeID
@@ -8018,8 +7082,7 @@ protected void SafelyComputeFirstNavMeshPath(
             IEnumerable<int?> navMeshIdsWIthDefault =
                 navMeshIds != null ? navMeshIds.Select(x => (int?)x) : defaultNavmeshIds;
 
-            foreach (var navmeshId in navMeshIdsWIthDefault)
-            {
+            foreach (var navmeshId in navMeshIdsWIthDefault) {
                 SafelyComputeNavMeshPath(
                     start: start,
                     target: target,
@@ -8031,8 +7094,7 @@ protected void SafelyComputeFirstNavMeshPath(
                     navmehsAgent: navMeshAgent,
                     navmeshSurfaces: navmeshSurfaces
                 );
-                if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete)
-                {
+                if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete) {
                     return;
                 }
             }
@@ -8048,8 +7110,7 @@ protected void SafelyComputeNavMeshPath(
             bool sampleFromNavmesh = true,
             UnityEngine.AI.NavMeshAgent navmehsAgent = null, // for speedup
             NavMeshSurfaceExtended[] navmeshSurfaces = null
-        )
-        {
+        ) {
             var navMeshAgent =
                 navmehsAgent ?? this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>();
             navMeshAgent.enabled = true;
@@ -8066,8 +7127,7 @@ protected void SafelyComputeNavMeshPath(
             var pathStartPosition = new Vector3(start.x, start.y, start.z);
             var pathTargetPosition = new Vector3(target.x, start.y, target.z);
 
-            if (sampleFromNavmesh)
-            {
+            if (sampleFromNavmesh) {
                 float floorY = Math.Min(
                     getFloorY(start.x, start.y, start.z),
                     getFloorY(target.x, target.y, target.z)
@@ -8096,17 +7156,14 @@ protected void SafelyComputeNavMeshPath(
                 pathStartPosition = startHit.position;
                 pathTargetPosition = targetHit.position;
 
-                if (!startWasHit || !targetWasHit)
-                {
+                if (!startWasHit || !targetWasHit) {
                     this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>().enabled = false;
-                    if (!startWasHit)
-                    {
+                    if (!startWasHit) {
                         throw new InvalidOperationException(
                             $"No point on NavMesh near startPosition {startPositionWithFloorY}."
                         );
                     }
-                    if (!targetWasHit)
-                    {
+                    if (!targetWasHit) {
                         throw new InvalidOperationException(
                             $"No point on NavMesh near targetPosition {targetPositionWithFloorY}."
                         );
@@ -8129,8 +7186,7 @@ protected void SafelyComputeNavMeshPath(
                         targetPositionWithFloorY.z
                     )
                 );
-                if (startOffset > allowedError && targetOffset > allowedError)
-                {
+                if (startOffset > allowedError && targetOffset > allowedError) {
                     this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>().enabled = false;
                     var extraDebug = !string.IsNullOrEmpty(debugTargetObjectId)
                         ? $" For objectId: '{debugTargetObjectId}'"
@@ -8186,8 +7242,7 @@ protected void SafelyComputeNavMeshPath(
             // bool pathSuccess = UnityEngine.AI.NavMesh.CalculatePath(
             //     startHit.position, targetHit.position, UnityEngine.AI.NavMesh.AllAreas, path
             // );
-            if (path.status != UnityEngine.AI.NavMeshPathStatus.PathComplete)
-            {
+            if (path.status != UnityEngine.AI.NavMeshPathStatus.PathComplete) {
                 var extraDebug = !string.IsNullOrEmpty(debugTargetObjectId)
                     ? $" For objectId: '{debugTargetObjectId}'"
                     : "";
@@ -8204,49 +7259,39 @@ protected void SafelyComputeNavMeshPath(
             this.GetComponentInChildren<UnityEngine.AI.NavMeshAgent>().enabled = false;
         }
 
-        private void randomizeSmoothness(string objectId)
-        {
+        private void randomizeSmoothness(string objectId) {
             SimObjPhysics sop = getSimObjectFromId(objectId: objectId);
-            if (sop == null)
-            {
+            if (sop == null) {
                 throw new ArgumentException($"No object with id {objectId} found.");
             }
 
-            Renderer[] renderers = sop.GetComponentsInChildren<Renderer>();
-            foreach (Renderer renderer in renderers)
-            {
-                foreach (Material material in renderer.materials)
-                {
+            Renderer[] renderers = sop.GetComponentsInChildren<Renderer>();
+            foreach (Renderer renderer in renderers) {
+                foreach (Material material in renderer.materials) {
                     material.SetFloat("_Metallic", Random.Range(0.0f, 1.0f));
                     material.SetFloat("_GlossMapScale", Random.Range(0.0f, 1.0f));
                 }
             }
         }
 
-        public void MakeAllObjectsUnbreakable()
-        {
+        public void MakeAllObjectsUnbreakable() {
             UpdateBreakabilityOfAllObjects(true);
         }
 
-        public void MakeAllObjectsBreakable()
-        {
+        public void MakeAllObjectsBreakable() {
             UpdateBreakabilityOfAllObjects(false);
         }
 
-        private void UpdateBreakabilityOfAllObjects(bool isUnbreakable)
-        {
+        private void UpdateBreakabilityOfAllObjects(bool isUnbreakable) {
             SimObjPhysics[] simObjs =
                 GameObject.FindObjectsOfType(typeof(SimObjPhysics)) as SimObjPhysics[];
-            if (simObjs != null)
-            {
-                foreach (SimObjPhysics sop in simObjs)
-                {
+            if (simObjs != null) {
+                foreach (SimObjPhysics sop in simObjs) {
                     if (
                         sop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.CanBreak
                         )
-                    )
-                    {
+                    ) {
                         sop.GetComponentInChildren<Break>().Unbreakable = isUnbreakable;
                     }
                 }
@@ -8254,20 +7299,16 @@ private void UpdateBreakabilityOfAllObjects(bool isUnbreakable)
             actionFinished(true);
         }
 
-        public void RandomizeSmoothness(string objectId)
-        {
+        public void RandomizeSmoothness(string objectId) {
             randomizeSmoothness(objectId: objectId);
             actionFinished(success: true);
         }
 
-        public void RandomizeSmoothness(string[] objectIds)
-        {
-            if (objectIds == null)
-            {
+        public void RandomizeSmoothness(string[] objectIds) {
+            if (objectIds == null) {
                 throw new ArgumentNullException(nameof(objectIds));
             }
-            foreach (string objectId in objectIds)
-            {
+            foreach (string objectId in objectIds) {
                 randomizeSmoothness(objectId: objectId);
             }
             actionFinished(success: true);
@@ -8279,8 +7320,7 @@ public void GetShortestPathToPoint(
             float allowedError = DefaultAllowedErrorInShortestPath,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             var path = new UnityEngine.AI.NavMeshPath();
             SafelyComputeFirstNavMeshPath(
                 position,
@@ -8298,8 +7338,7 @@ public void GetShortestPathToPoint(
             float allowedError = DefaultAllowedErrorInShortestPath,
             IEnumerable<int> navMeshIds = null,
             bool sampleFromNavmesh = true
-        )
-        {
+        ) {
             var startPosition = this.transform.position;
             GetShortestPathToPoint(
                 startPosition,
@@ -8310,11 +7349,9 @@ public void GetShortestPathToPoint(
             );
         }
 
-        public void VisualizeShortestPaths(ServerAction action)
-        {
+        public void VisualizeShortestPaths(ServerAction action) {
             SimObjPhysics sop = getSimObjectFromTypeOrId(action.objectType, action.objectId);
-            if (sop == null)
-            {
+            if (sop == null) {
                 actionFinished(false);
                 return;
             }
@@ -8323,8 +7360,7 @@ public void VisualizeShortestPaths(ServerAction action)
 
             Instantiate(DebugTargetPointPrefab, sop.transform.position, Quaternion.identity);
             var results = new List<bool>();
-            for (var i = 0; i < action.positions.Count; i++)
-            {
+            for (var i = 0; i < action.positions.Count; i++) {
                 var pos = action.positions[i];
                 var go = Instantiate(DebugPointPrefab, pos, Quaternion.identity);
                 var textMesh = go.GetComponentInChildren<TextMesh>();
@@ -8340,8 +7376,7 @@ public void VisualizeShortestPaths(ServerAction action)
 
                 var lineRenderer = go.GetComponentInChildren<LineRenderer>();
 
-                if (action.pathGradient != null && action.pathGradient.colorKeys.Length > 0)
-                {
+                if (action.pathGradient != null && action.pathGradient.colorKeys.Length > 0) {
                     lineRenderer.colorGradient = action.pathGradient;
                 }
                 lineRenderer.startWidth = 0.015f;
@@ -8349,8 +7384,7 @@ public void VisualizeShortestPaths(ServerAction action)
 
                 results.Add(path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete);
 
-                if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete)
-                {
+                if (path.status == UnityEngine.AI.NavMeshPathStatus.PathComplete) {
                     lineRenderer.positionCount = path.corners.Length;
                     lineRenderer.SetPositions(
                         path.corners.Select(c => new Vector3(c.x, gridVisualizeY + 0.005f, c.z))
@@ -8365,12 +7399,10 @@ public void VisualizeWaypoints(
             List<Waypoint> waypoints,
             bool grid = false,
             Color? gridColor = null
-        )
-        {
+        ) {
             getReachablePositions(1.0f, 10000, grid, gridColor);
 
-            for (var i = 0; i < waypoints.Count; i++)
-            {
+            for (var i = 0; i < waypoints.Count; i++) {
                 var waypoint = waypoints[i];
                 var pos = waypoint.position;
                 var go = Instantiate(DebugPointPrefab, pos, Quaternion.identity);
@@ -8386,8 +7418,7 @@ public void VisualizeWaypoints(
             actionFinished(true);
         }
 
-        public void CameraCrack(int randomSeed = 0)
-        {
+        public void CameraCrack(int randomSeed = 0) {
             GameObject canvas = Instantiate(CrackedCameraCanvas);
             CrackedCameraManager camMan = canvas.GetComponent<CrackedCameraManager>();
 
@@ -8395,8 +7426,7 @@ public void CameraCrack(int randomSeed = 0)
             actionFinished(true);
         }
 
-        public void SimObjPhysicsTypeIsReceptacle(float receptacleRatioTolerance = 0.001f)
-        {
+        public void SimObjPhysicsTypeIsReceptacle(float receptacleRatioTolerance = 0.001f) {
             var sops = GameObject
                 .FindObjectOfType<ProceduralAssetDatabase>()
                 .GetPrefabs()
@@ -8410,8 +7440,7 @@ public void SimObjPhysicsTypeIsReceptacle(float receptacleRatioTolerance = 0.001
                     sop.SecondaryProperties.Contains(SimObjSecondaryProperty.Receptacle)
                 )
                 .GroupBy(sop => sop.ObjType)
-                .Select(g => new
-                {
+                .Select(g => new {
                     simObjType = g.Key.ToString(),
                     totalInCategory = categoriesCount[g.Key],
                     totalIsReceptacle = categoriesCount[g.Key]
@@ -8429,10 +7458,8 @@ public static void TryToAddReceptacleTriggerBox(
             SimObjPhysics sop,
             float yThresMax = 0.075f,
             float worldOffset = -100f
-        )
-        {
-            if (sop == null)
-            {
+        ) {
+            if (sop == null) {
                 throw new NotImplementedException(
                     $"Adding receptacle trigger box is only possible the active game object, has an associated SimObjPhysics script."
                 );
@@ -8443,23 +7470,19 @@ public static void TryToAddReceptacleTriggerBox(
 
             List<MeshCollider> tmpMeshColliders = new List<MeshCollider>();
             List<Collider> enabledColliders = new List<Collider>();
-            foreach (Collider c in sop.GetComponentsInChildren<Collider>())
-            {
-                if (c.enabled)
-                {
+            foreach (Collider c in sop.GetComponentsInChildren<Collider>()) {
+                if (c.enabled) {
                     enabledColliders.Add(c);
                     c.enabled = false;
                 }
             }
 
-            try
-            {
+            try {
                 sop.transform.rotation = Quaternion.identity;
                 sop.transform.position = new Vector3(worldOffset, worldOffset, worldOffset);
                 sop.GetComponent<Rigidbody>().isKinematic = true;
 
-                foreach (MeshFilter mf in sop.GetComponentsInChildren<MeshFilter>())
-                {
+                foreach (MeshFilter mf in sop.GetComponentsInChildren<MeshFilter>()) {
                     GameObject tmpGo = new GameObject();
                     tmpGo.layer = LayerMask.NameToLayer("SimObjVisible");
                     tmpGo.transform.position = mf.gameObject.transform.position;
@@ -8498,14 +7521,12 @@ public static void TryToAddReceptacleTriggerBox(
 
                 List<List<float>> mat = new List<List<float>>();
                 int n = 30;
-                for (int iX = 0; iX < n; iX++)
-                {
+                for (int iX = 0; iX < n; iX++) {
                     float x = xMin + iX * (xMax - xMin) / (n - 1.0f);
                     // Debug.Log($"x val: {x}");
 
                     var yVals = new List<float>();
-                    for (int iZ = 0; iZ < n; iZ++)
-                    {
+                    for (int iZ = 0; iZ < n; iZ++) {
                         float z = zMin + iZ * (zMax - zMin) / (n - 1.0f);
 
                         // Debug.Log($"Pos: ({iX}, {iZ}), vals ({x}, {z})");
@@ -8520,22 +7541,16 @@ public static void TryToAddReceptacleTriggerBox(
                                 layerMask: LayerMask.GetMask("SimObjVisible"),
                                 queryTriggerInteraction: QueryTriggerInteraction.Ignore
                             )
-                        )
-                        {
+                        ) {
                             // Debug.Log($"HITS {hit.point.y}");
                             // Debug.DrawLine(hit.point, hit.point + new Vector3(0f, 0.1f, 0f), Color.cyan, 15f);
 
-                            if (Vector3.Angle(hit.normal, Vector3.up) < 30f)
-                            {
+                            if (Vector3.Angle(hit.normal, Vector3.up) < 30f) {
                                 yVals.Add(hit.point.y);
-                            }
-                            else
-                            {
+                            } else {
                                 yVals.Add(dummyY);
                             }
-                        }
-                        else
-                        {
+                        } else {
                             yVals.Add(dummyY);
                         }
                     }
@@ -8549,24 +7564,20 @@ public static void TryToAddReceptacleTriggerBox(
                     new Dictionary<int, List<(int, int)>>();
 
                 int nextGroup = 0;
-                for (int iX = 0; iX < n; iX++)
-                {
-                    for (int iZ = 0; iZ < n; iZ++)
-                    {
+                for (int iX = 0; iX < n; iX++) {
+                    for (int iZ = 0; iZ < n; iZ++) {
                         // Debug.Log($"Pos: ({iX}, {iZ})");
                         float curYVal = mat[iX][iZ];
                         // Debug.Log($"Cur Y: {curYVal}");
 
-                        if (curYVal == dummyY)
-                        {
+                        if (curYVal == dummyY) {
                             posToGroup[(iX, iZ)] = -1;
                             groupToMaxYVal[-1] = dummyY;
                             groupToMinYVal[-1] = dummyY;
                             continue;
                         }
 
-                        if (iX > 0)
-                        {
+                        if (iX > 0) {
                             int group = posToGroup[(iX - 1, iZ)];
                             float otherMaxYVal = groupToMaxYVal[group];
                             float otherMinYVal = groupToMinYVal[group];
@@ -8574,8 +7585,7 @@ public static void TryToAddReceptacleTriggerBox(
                             if (
                                 Mathf.Abs(curYVal - otherMaxYVal) < yThres
                                 && Mathf.Abs(curYVal - otherMinYVal) < yThres
-                            )
-                            {
+                            ) {
                                 posToGroup[(iX, iZ)] = group;
                                 groupToPos[group].Add((iX, iZ));
                                 groupToMaxYVal[group] = Mathf.Max(curYVal, otherMaxYVal);
@@ -8584,8 +7594,7 @@ public static void TryToAddReceptacleTriggerBox(
                             }
                         }
 
-                        if (iZ > 0)
-                        {
+                        if (iZ > 0) {
                             int group = posToGroup[(iX, iZ - 1)];
                             float otherMaxYVal = groupToMaxYVal[group];
                             float otherMinYVal = groupToMinYVal[group];
@@ -8593,8 +7602,7 @@ public static void TryToAddReceptacleTriggerBox(
                             if (
                                 Mathf.Abs(curYVal - otherMaxYVal) < yThres
                                 && Mathf.Abs(curYVal - otherMinYVal) < yThres
-                            )
-                            {
+                            ) {
                                 posToGroup[(iX, iZ)] = group;
                                 groupToPos[group].Add((iX, iZ));
                                 groupToMaxYVal[group] = Mathf.Max(curYVal, otherMaxYVal);
@@ -8614,52 +7622,43 @@ public static void TryToAddReceptacleTriggerBox(
 
                 // TODO: Improve this logic so that we get rectangles more intelligently
                 var groupToRectangles = new Dictionary<int, List<((int, int), (int, int))>>();
-                foreach (int group in groupToPos.Keys)
-                {
+                foreach (int group in groupToPos.Keys) {
                     var posSet = new HashSet<(int, int)>(groupToPos[group]);
 
                     List<((int, int), (int, int))> rectangles =
                         new List<((int, int), (int, int))>();
 
-                    while (posSet.Count > 0)
-                    {
+                    while (posSet.Count > 0) {
                         (int, int) nextiXiZ = posSet.Min();
 
                         int startIX = nextiXiZ.Item1;
                         int startIZ = nextiXiZ.Item2;
 
                         int k = 1;
-                        while (posSet.Contains((startIX + k, startIZ)))
-                        {
+                        while (posSet.Contains((startIX + k, startIZ))) {
                             k++;
                         }
 
                         int endIX = startIX + k - 1;
 
                         k = 1;
-                        while (true)
-                        {
+                        while (true) {
                             bool allContained = true;
-                            for (int iX = startIX; iX <= endIX; iX++)
-                            {
-                                if (!posSet.Contains((iX, startIZ + k)))
-                                {
+                            for (int iX = startIX; iX <= endIX; iX++) {
+                                if (!posSet.Contains((iX, startIZ + k))) {
                                     allContained = false;
                                     break;
                                 }
                             }
-                            if (!allContained)
-                            {
+                            if (!allContained) {
                                 break;
                             }
                             k++;
                         }
                         int endIZ = startIZ + k - 1;
 
-                        for (int iX = startIX; iX <= endIX; iX++)
-                        {
-                            for (int iZ = startIZ; iZ <= endIZ; iZ++)
-                            {
+                        for (int iX = startIX; iX <= endIX; iX++) {
+                            for (int iZ = startIZ; iZ <= endIZ; iZ++) {
                                 posSet.Remove((iX, iZ));
                             }
                         }
@@ -8681,12 +7680,10 @@ public static void TryToAddReceptacleTriggerBox(
                     Color.blue
                 };
                 int yar = -1;
-                foreach (int group in groupToRectangles.Keys)
-                {
+                foreach (int group in groupToRectangles.Keys) {
                     float y = groupToMinYVal[group];
 
-                    foreach (((int, int), (int, int)) extents in groupToRectangles[group])
-                    {
+                    foreach (((int, int), (int, int)) extents in groupToRectangles[group]) {
                         yar++;
                         (int, int) start = extents.Item1;
                         (int, int) end = extents.Item2;
@@ -8702,8 +7699,7 @@ public static void TryToAddReceptacleTriggerBox(
                                 Math.Abs(start.Item1 - end.Item1),
                                 Math.Abs(start.Item2 - end.Item2)
                             ) <= 1
-                        )
-                        {
+                        ) {
                             continue;
                         }
 
@@ -8726,12 +7722,10 @@ public static void TryToAddReceptacleTriggerBox(
 
                 Transform t = sop.transform.Find("ReceptacleTriggerBoxes");
                 GameObject go = null;
-                if (t != null)
-                {
+                if (t != null) {
                     GameObject.DestroyImmediate(t.gameObject);
                 }
-                if (t == null)
-                {
+                if (t == null) {
                     go = new GameObject("ReceptacleTriggerBoxes");
                     go.transform.position = sop.transform.position;
                     go.transform.parent = sop.transform;
@@ -8740,8 +7734,7 @@ public static void TryToAddReceptacleTriggerBox(
 
                 int cornerListInd = 0;
                 List<GameObject> boxGos = new List<GameObject>();
-                foreach (List<Vector3> cornerList in vector3CornerLists)
-                {
+                foreach (List<Vector3> cornerList in vector3CornerLists) {
                     Vector3 c0 = cornerList[0];
                     Vector3 c1 = cornerList[1];
                     Vector3 c2 = cornerList[2];
@@ -8762,19 +7755,15 @@ public static void TryToAddReceptacleTriggerBox(
                     bc.isTrigger = true;
                 }
                 sop.ReceptacleTriggerBoxes = boxGos.ToArray();
-            }
-            finally
-            {
+            } finally {
                 sop.transform.position = oldPos;
                 sop.transform.rotation = oldRot;
                 sop.GetComponent<Rigidbody>().isKinematic = false;
 
-                foreach (MeshCollider tmc in tmpMeshColliders)
-                {
+                foreach (MeshCollider tmc in tmpMeshColliders) {
                     GameObject.DestroyImmediate(tmc.gameObject);
                 }
-                foreach (Collider c in enabledColliders)
-                {
+                foreach (Collider c in enabledColliders) {
                     c.enabled = true;
                 }
                 Physics.SyncTransforms();
@@ -8791,8 +7780,7 @@ public void CreateSkybox(
             string rightTexturePath,
             string frontTexturePath,
             string backTexturePath
-        )
-        {
+        ) {
             Texture2D upTexture = new Texture2D(2, 2);
             upTexture.LoadImage(File.ReadAllBytes(upTexturePath));
             Texture2D downTexture = new Texture2D(2, 2);
@@ -8819,11 +7807,9 @@ string backTexturePath
             actionFinished(true);
         }
 
-        public ActionFinished CreateRuntimeAsset(ProceduralAsset asset)
-        {
+        public ActionFinished CreateRuntimeAsset(ProceduralAsset asset) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb.ContainsAssetKey(asset.name))
-            {
+            if (assetDb.ContainsAssetKey(asset.name)) {
                 return new ActionFinished(
                     success: false,
                     errorMessage: $"'{asset.name}' already exists in ProceduralAssetDatabase, trying to create procedural object twice, call `SpawnAsset` instead.",
@@ -8858,11 +7844,9 @@ public ActionFinished CreateRuntimeAsset(
             string extension = ".msgpack.gz",
             ObjectAnnotations annotations = null,
             bool serializable = false
-        )
-        {
+        ) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb.ContainsAssetKey(id))
-            {
+            if (assetDb.ContainsAssetKey(id)) {
                 return new ActionFinished(
                     success: false,
                     errorMessage: $"'{id}' already exists in ProceduralAssetDatabase, trying to create procedural object twice, call `SpawnAsset` instead.",
@@ -8883,8 +7867,7 @@ public ActionFinished CreateRuntimeAsset(
             };
             extension = !extension.StartsWith(".") ? $".{extension}" : extension;
             extension = extension.Trim();
-            if (!supportedExtensions.Contains(extension))
-            {
+            if (!supportedExtensions.Contains(extension)) {
                 return new ActionFinished(
                     success: false,
                     errorMessage: $"Unsupported extension `{extension}`. Only supported: {string.Join(", ", supportedExtensions)}",
@@ -8893,8 +7876,7 @@ public ActionFinished CreateRuntimeAsset(
             }
             var filename = $"{id}{extension}";
             var filepath = Path.GetFullPath(Path.Combine(dir, id, filename));
-            if (!File.Exists(filepath))
-            {
+            if (!File.Exists(filepath)) {
                 return new ActionFinished(
                     success: false,
                     actionReturn: null,
@@ -8912,35 +7894,28 @@ public ActionFinished CreateRuntimeAsset(
             using FileStream rawFileStream = File.Open(filepath, FileMode.Open);
             using var resultStream = new MemoryStream();
             var stageIndex = 0;
-            if ("gz" == presentStages[stageIndex])
-            {
+            if ("gz" == presentStages[stageIndex]) {
                 using var decompressor = new GZipStream(rawFileStream, CompressionMode.Decompress);
                 decompressor.CopyTo(resultStream);
                 stageIndex++;
-            }
-            else
-            {
+            } else {
                 rawFileStream.CopyTo(resultStream);
             }
 
             ProceduralAsset procAsset = null;
             var debug = stageIndex < presentStages.Length ? presentStages[stageIndex] : "null";
 
-            if (stageIndex < presentStages.Length && presentStages[stageIndex] == "msgpack")
-            {
+            if (stageIndex < presentStages.Length && presentStages[stageIndex] == "msgpack") {
                 procAsset = MessagePack.MessagePackSerializer.Deserialize<ProceduralAsset>(
                     resultStream.ToArray(),
                     MessagePack.Resolvers.ThorContractlessStandardResolver.Options
                 );
-            }
-            else if (presentStages.Length == 1)
-            {
+            } else if (presentStages.Length == 1) {
                 resultStream.Seek(0, SeekOrigin.Begin);
                 using var reader = new StreamReader(resultStream);
 
                 var jsonResolver = new ShouldSerializeContractResolver();
-                var serializer = new Newtonsoft.Json.JsonSerializerSettings()
-                {
+                var serializer = new Newtonsoft.Json.JsonSerializerSettings() {
                     ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                     ContractResolver = jsonResolver,
                     ObjectCreationHandling = ObjectCreationHandling.Replace
@@ -8948,9 +7923,7 @@ public ActionFinished CreateRuntimeAsset(
                 var json = reader.ReadToEnd();
                 // procAsset = Newtonsoft.Json.JsonConvert.DeserializeObject<ProceduralAsset>(reader.ReadToEnd(), serializer);
                 procAsset = JsonConvert.DeserializeObject<ProceduralAsset>(json);
-            }
-            else
-            {
+            } else {
                 return new ActionFinished(
                     success: false,
                     errorMessage: $"Unexpected error with extension `{extension}`, filepath: `{filepath}`, compression stages: {string.Join(".", presentStages)}. Only supported: {string.Join(", ", supportedExtensions)}",
@@ -8987,18 +7960,15 @@ public ActionFinished CreateRuntimeAsset(
             return new ActionFinished(success: true, actionReturn: assetData);
         }
 
-        public void GetStreamingAssetsPath()
-        {
+        public void GetStreamingAssetsPath() {
             actionFinished(success: true, actionReturn: Application.streamingAssetsPath);
         }
 
-        public void GetPersistentDataPath()
-        {
+        public void GetPersistentDataPath() {
             actionFinished(success: true, actionReturn: Application.persistentDataPath);
         }
 
-        public void CreateHouse(ProceduralHouse house)
-        {
+        public void CreateHouse(ProceduralHouse house) {
             var rooms = house.rooms.SelectMany(room => house.rooms);
 
             var materials = ProceduralTools.GetMaterials();
@@ -9012,8 +7982,7 @@ public void CreateHouse(ProceduralHouse house)
                     .Concat(new List<string>() { house.proceduralParameters.ceilingMaterial.name })
             );
             var missingIds = materialIds.Where(id => id != null && !materials.ContainsKey(id));
-            if (missingIds.Count() > 0)
-            {
+            if (missingIds.Count() > 0) {
                 actionFinished(
                     success: false,
                     errorMessage: (
@@ -9023,12 +7992,9 @@ public void CreateHouse(ProceduralHouse house)
                 );
             }
 
-            try
-            {
+            try {
                 ProceduralTools.CreateHouse(house: house, materialDb: materials);
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.Log(e);
                 var msg = $"Exception creating house.\n'{e.Message}'\n'{e.InnerException}'";
                 Debug.Log(msg);
@@ -9038,8 +8004,7 @@ public void CreateHouse(ProceduralHouse house)
             actionFinished(true);
         }
 
-        public void GetHouseFromTemplate(HouseTemplate template)
-        {
+        public void GetHouseFromTemplate(HouseTemplate template) {
             var rooms = template.rooms.Select(room => room.Value);
 
             // TODO: Bring back for validation and add tests when making this API public
@@ -9089,54 +8054,45 @@ public void GetHouseFromTemplate(HouseTemplate template)
             actionFinished(true, house);
         }
 
-        protected Dictionary<string, object> getAssetMetadata(GameObject asset)
-        {
-            if (asset.GetComponent<SimObjPhysics>() == null)
-            {
+        protected Dictionary<string, object> getAssetMetadata(GameObject asset) {
+            if (asset.GetComponent<SimObjPhysics>() == null) {
                 return null;
             }
 
             var simObj = asset.GetComponent<SimObjPhysics>();
             var bb = simObj.AxisAlignedBoundingBox;
 
-            return new Dictionary<string, object>()
-            {
+            return new Dictionary<string, object>() {
                 ["name"] = simObj.gameObject.name,
                 ["objectType"] = simObj.Type.ToString(),
                 ["primaryProperty"] = simObj.PrimaryProperty.ToString(),
                 ["secondaryProperties"] = simObj
                     .SecondaryProperties.Select(s => s.ToString())
                     .ToList(),
-                ["boundingBox"] = new BoundingBox()
-                {
+                ["boundingBox"] = new BoundingBox() {
                     min = bb.center - bb.size / 2.0f,
                     max = bb.center + bb.size / 2.0f
                 }
             };
         }
 
-        public void GetAssetDatabase()
-        {
+        public void GetAssetDatabase() {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb == null)
-            {
+            if (assetDb == null) {
                 errorMessage = "ProceduralAssetDatabase not in scene.";
                 actionFinishedEmit(false);
                 return;
             }
 
             var metadata = new Dictionary<string, Dictionary<string, object>>();
-            foreach (GameObject p in assetDb.GetPrefabs())
-            {
+            foreach (GameObject p in assetDb.GetPrefabs()) {
                 var meta = getAssetMetadata(p);
-                if (meta == null)
-                {
+                if (meta == null) {
                     continue;
                 }
 
                 var name = meta["name"].ToString();
-                if (metadata.ContainsKey(name))
-                {
+                if (metadata.ContainsKey(name)) {
                     throw new InvalidOperationException(
                         $"There are duplicate assets with the name '{name}'."
                     );
@@ -9148,25 +8104,21 @@ public void GetAssetDatabase()
             actionFinishedEmit(true, metadata);
         }
 
-        public void AssetInDatabase(string assetId)
-        {
+        public void AssetInDatabase(string assetId) {
             var assetMap = ProceduralTools.getAssetMap();
 
             actionFinishedEmit(success: true, actionReturn: assetMap.ContainsKey(assetId));
         }
 
-        public void TouchProceduralLRUCache(List<string> assetIds)
-        {
+        public void TouchProceduralLRUCache(List<string> assetIds) {
             var assetDB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
             assetDB.touchProceduralLRUCache(assetIds);
             actionFinishedEmit(success: true);
         }
 
-        public void DeleteLRUFromProceduralCache(int assetLimit)
-        {
+        public void DeleteLRUFromProceduralCache(int assetLimit) {
             var assetDB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDB == null)
-            {
+            if (assetDB == null) {
                 errorMessage = "No ProceduralAssetDatabase seems to exist.";
                 //                Debug.Log(errorMessage);
                 actionFinishedEmit(success: false);
@@ -9178,8 +8130,7 @@ public void DeleteLRUFromProceduralCache(int assetLimit)
             actionFinishedEmit(success: true);
         }
 
-        public void GetLRUCacheKeys()
-        {
+        public void GetLRUCacheKeys() {
             var assetDB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
             actionFinishedEmit(
                 success: true,
@@ -9187,12 +8138,10 @@ public void GetLRUCacheKeys()
             );
         }
 
-        public void AssetsInDatabase(List<string> assetIds, bool updateProceduralLRUCache = false)
-        {
+        public void AssetsInDatabase(List<string> assetIds, bool updateProceduralLRUCache = false) {
             var assetDB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
 
-            if (updateProceduralLRUCache)
-            {
+            if (updateProceduralLRUCache) {
                 assetDB.touchProceduralLRUCache(assetIds);
             }
             var assetMap = assetDB.assetMap;
@@ -9206,11 +8155,9 @@ public void AssetsInDatabase(List<string> assetIds, bool updateProceduralLRUCach
 
         // returns manually annotated "hole" metadata for connectors like doors of windows, to generate
         // the correct procedural polygons when creating a procedural house.
-        public void GetAssetHoleMetadata(string assetId)
-        {
+        public void GetAssetHoleMetadata(string assetId) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb == null)
-            {
+            if (assetDb == null) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: "ProceduralAssetDatabase not in scene."
@@ -9218,8 +8165,7 @@ public void GetAssetHoleMetadata(string assetId)
             }
             var assetMap = ProceduralTools.getAssetMap();
 
-            if (!assetMap.ContainsKey(assetId))
-            {
+            if (!assetMap.ContainsKey(assetId)) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: $"Asset '{assetId}' is not contained in asset database, you may need to rebuild asset database."
@@ -9230,15 +8176,12 @@ public void GetAssetHoleMetadata(string assetId)
 
             var result = ProceduralTools.getHoleAssetBoundingBox(assetId);
 
-            if (result == null)
-            {
+            if (result == null) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: $"Asset '{assetId}' does not have a HoleMetadata component, it's probably not a connector like a door or window or component has to be added in the prefab."
                 );
-            }
-            else
-            {
+            } else {
                 actionFinishedEmit(success: false, actionReturn: result);
             }
         }
@@ -9249,8 +8192,7 @@ public void GetInSceneAssetGeometry(
             bool triangles = false,
             bool uv = false,
             bool normals = false
-        )
-        {
+        ) {
             SimObjPhysics asset = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
@@ -9258,31 +8200,26 @@ public void GetInSceneAssetGeometry(
             MeshFilter[] meshFilters = asset.GetComponentsInChildren<MeshFilter>();
 
             var geometries = new List<object>();
-            foreach (MeshFilter meshFilter in meshFilters)
-            {
+            foreach (MeshFilter meshFilter in meshFilters) {
                 var geo = new Dictionary<string, object>();
                 Mesh mesh = meshFilter.mesh;
                 Matrix4x4 localToWorld = meshFilter.gameObject.transform.localToWorldMatrix;
 
                 var globalVertices = new List<Vector3>();
-                foreach (Vector3 vertex in mesh.vertices)
-                {
+                foreach (Vector3 vertex in mesh.vertices) {
                     // converts from local space to world space.
                     Vector3 worldCoordinate = localToWorld.MultiplyPoint3x4(vertex);
                     globalVertices.Add(worldCoordinate);
                 }
                 geo["vertices"] = globalVertices;
 
-                if (triangles)
-                {
+                if (triangles) {
                     geo["triangles"] = mesh.triangles;
                 }
-                if (uv)
-                {
+                if (uv) {
                     geo["uv"] = mesh.uv;
                 }
-                if (normals)
-                {
+                if (normals) {
                     geo["normals"] = mesh.normals;
                 }
                 geometries.Add(geo);
@@ -9290,8 +8227,7 @@ public void GetInSceneAssetGeometry(
             actionFinishedEmit(success: true, actionReturn: geometries);
         }
 
-        public void DestroyHouse()
-        {
+        public void DestroyHouse() {
             Destroy(GameObject.Find("Objects"));
             Destroy(GameObject.Find("Structure"));
             Destroy(GameObject.Find("ProceduralLighting"));
@@ -9310,19 +8246,16 @@ public void GetAsset3DGeometry(
             bool triangleIndices = true,
             bool uvs = false,
             bool normals = false
-        )
-        {
+        ) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb == null)
-            {
+            if (assetDb == null) {
                 errorMessage = "ProceduralAssetDatabase not in scene.";
                 actionFinishedEmit(false);
                 return;
             }
             var assetMap = ProceduralTools.getAssetMap();
 
-            if (!assetMap.ContainsKey(assetId))
-            {
+            if (!assetMap.ContainsKey(assetId)) {
                 errorMessage =
                     $"Object '{assetId}' is not contained in asset database, you may need to rebuild asset database.";
                 actionFinishedEmit(false);
@@ -9334,8 +8267,7 @@ public void GetAsset3DGeometry(
             var meshFilters = asset.GetComponentsInChildren<MeshFilter>();
 
             var geoList = meshFilters
-                .Select(meshFilter =>
-                {
+                .Select(meshFilter => {
                     var mesh = meshFilter.sharedMesh;
                     var geo = new Geometry3D() { vertices = mesh.vertices };
                     geo.triangleIndices = triangleIndices ? mesh.triangles : null;
@@ -9352,13 +8284,10 @@ public ActionFinished SpawnAsset(
             string generatedId,
             Vector3? position = null,
             Vector3? rotation = null
-        )
-        {
+        ) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb == null)
-            {
-                return new ActionFinished()
-                {
+            if (assetDb == null) {
+                return new ActionFinished() {
                     toEmitState = true,
                     success = false,
                     errorMessage = "ProceduralAssetDatabase not in scene."
@@ -9366,10 +8295,8 @@ public ActionFinished SpawnAsset(
             }
             var assetMap = ProceduralTools.getAssetMap();
 
-            if (!assetMap.ContainsKey(assetId))
-            {
-                return new ActionFinished()
-                {
+            if (!assetMap.ContainsKey(assetId)) {
+                return new ActionFinished() {
                     toEmitState = true,
                     success = false,
                     errorMessage =
@@ -9390,8 +8317,7 @@ public ActionFinished SpawnAsset(
             );
 
             spawned.isStatic = true;
-            foreach (var rigidBody in spawned.GetComponentsInChildren<Rigidbody>())
-            {
+            foreach (var rigidBody in spawned.GetComponentsInChildren<Rigidbody>()) {
                 rigidBody.useGravity = false;
                 rigidBody.isKinematic = true;
             }
@@ -9399,11 +8325,9 @@ public ActionFinished SpawnAsset(
             physicsSceneManager.SetupScene(generateObjectIds: false);
 
             var bounds = GetObjectSphereBounds(spawned);
-            return new ActionFinished()
-            {
+            return new ActionFinished() {
                 success = true,
-                actionReturn = new ObjectSphereBounds()
-                {
+                actionReturn = new ObjectSphereBounds() {
                     id = spawned.name,
                     worldSpaceCenter = bounds.center,
                     radius = bounds.extents.magnitude
@@ -9411,18 +8335,15 @@ public ActionFinished SpawnAsset(
             };
         }
 
-        public void GetAssetSphereBounds(string assetId)
-        {
+        public void GetAssetSphereBounds(string assetId) {
             var assetDb = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
-            if (assetDb == null)
-            {
+            if (assetDb == null) {
                 errorMessage = "ProceduralAssetDatabase not in scene.";
                 actionFinishedEmit(false);
                 return;
             }
             var assetMap = ProceduralTools.getAssetMap();
-            if (!assetMap.ContainsKey(assetId))
-            {
+            if (!assetMap.ContainsKey(assetId)) {
                 errorMessage =
                     $"Asset '{assetId}' is not contained in asset database, you may need to rebuild asset database.";
                 actionFinishedEmit(false);
@@ -9435,8 +8356,7 @@ public void GetAssetSphereBounds(string assetId)
 
             actionFinishedEmit(
                 true,
-                new ObjectSphereBounds()
-                {
+                new ObjectSphereBounds() {
                     id = assetId,
                     worldSpaceCenter = bounds.center,
                     radius = bounds.extents.magnitude
@@ -9444,11 +8364,9 @@ public void GetAssetSphereBounds(string assetId)
             );
         }
 
-        public void LookAtObjectCenter(string objectId = "asset_0", Vector3? position = null)
-        {
+        public void LookAtObjectCenter(string objectId = "asset_0", Vector3? position = null) {
             var obj = GameObject.Find(objectId);
-            if (obj == null)
-            {
+            if (obj == null) {
                 errorMessage = $"Object does not exist in scene.";
                 actionFinishedEmit(false);
                 return;
@@ -9458,11 +8376,9 @@ public void LookAtObjectCenter(string objectId = "asset_0", Vector3? position =
             actionFinished(true, obj.name);
         }
 
-        public void SetSkybox(string materialId)
-        {
+        public void SetSkybox(string materialId) {
             var materialDb = ProceduralTools.GetMaterials();
-            if (materialDb == null)
-            {
+            if (materialDb == null) {
                 errorMessage = "ProceduralAssetDatabase not in scene.";
                 actionFinishedEmit(false);
                 return;
@@ -9470,15 +8386,13 @@ public void SetSkybox(string materialId)
             RenderSettings.skybox = materialDb.getAsset(materialId);
         }
 
-        public void SetSkybox(Color color)
-        {
+        public void SetSkybox(Color color) {
             m_Camera.clearFlags = CameraClearFlags.SolidColor;
             m_Camera.backgroundColor = color;
             actionFinished(true);
         }
 
-        private void LookAtObjectCenter(GameObject gameObject)
-        {
+        private void LookAtObjectCenter(GameObject gameObject) {
             var bounds = GetObjectSphereBounds(gameObject);
             // objectBounds = bounds;
             // var size = 2.0f * Mathf.Tan(m_Camera.fieldOfView / 2.0f) * bounds.extents.magnitude;
@@ -9490,8 +8404,7 @@ private void LookAtObjectCenter(GameObject gameObject)
                 bounds.center + Vector3.forward * (radius + dist);
 #if UNITY_EDITOR
             debugSpheres.Add(
-                new DebugSphere()
-                {
+                new DebugSphere() {
                     color = Color.yellow,
                     radius = radius,
                     worldSpaceCenter = bounds.center
@@ -9503,27 +8416,23 @@ private void LookAtObjectCenter(GameObject gameObject)
             m_Camera.transform.LookAt(bounds.center, Vector3.up);
         }
 
-        private Bounds GetObjectSphereBounds(GameObject gameObject)
-        {
+        private Bounds GetObjectSphereBounds(GameObject gameObject) {
             return gameObject
                 .GetComponentsInChildren<MeshRenderer>()
                 .Select(renderer => renderer.bounds)
                 .Aggregate(
                     new Bounds(),
-                    (allBounds, partBounds) =>
-                    {
+                    (allBounds, partBounds) => {
                         allBounds.Encapsulate(partBounds);
                         return allBounds;
                     }
                 );
         }
 
-        protected static Vector3[] GetBoundsCorners(Bounds bounds)
-        {
+        protected static Vector3[] GetBoundsCorners(Bounds bounds) {
             Vector3[] corners = new Vector3[8];
 
-            for (int i = 0; i < 8; i++)
-            {
+            for (int i = 0; i < 8; i++) {
                 corners[i] = new Vector3(
                     (i & 1) == 0 ? bounds.min.x : bounds.max.x,
                     (i & 2) == 0 ? bounds.min.y : bounds.max.y,
@@ -9534,8 +8443,7 @@ protected static Vector3[] GetBoundsCorners(Bounds bounds)
             return corners;
         }
 
-        protected static bool IsPointInView(Camera camera, Vector3 point, float minSlack)
-        {
+        protected static bool IsPointInView(Camera camera, Vector3 point, float minSlack) {
             Vector3 viewportPoint = camera.WorldToViewportPoint(point);
             return (
                 viewportPoint.z > 0
@@ -9551,8 +8459,7 @@ private static bool AreBoundsInViewAtDistance(
             Bounds bounds,
             float distance,
             float minSlack
-        )
-        {
+        ) {
             // Position the camera temporarily to calculate the visibility at the given distance
             Vector3 originalPosition = camera.transform.position;
             Quaternion originalRotation = camera.transform.rotation;
@@ -9565,10 +8472,8 @@ float minSlack
             // Check each corner of the bounds to see if it's visible
             bool allCornersInView = true;
             Vector3[] corners = GetBoundsCorners(bounds);
-            foreach (Vector3 corner in corners)
-            {
-                if (!IsPointInView(camera, corner, minSlack: minSlack))
-                {
+            foreach (Vector3 corner in corners) {
+                if (!IsPointInView(camera, corner, minSlack: minSlack)) {
                     allCornersInView = false;
                     break;
                 }
@@ -9581,14 +8486,12 @@ float minSlack
             return allCornersInView;
         }
 
-        public float FindClosestDistance(Camera camera, Bounds objectBounds, float minSlack = 0.01f)
-        {
+        public float FindClosestDistance(Camera camera, Bounds objectBounds, float minSlack = 0.01f) {
             float minDistance = 0.01f; // Minimum possible distance, avoid division by zero or negative values
 
             // Find a reasonable max distance by doubling until the object is in view
             float maxDistance = 1f;
-            for (int i = 0; i < 10; i++)
-            {
+            for (int i = 0; i < 10; i++) {
                 if (
                     !AreBoundsInViewAtDistance(
                         camera,
@@ -9596,33 +8499,25 @@ public float FindClosestDistance(Camera camera, Bounds objectBounds, float minSl
                         maxDistance,
                         minSlack: minSlack
                     )
-                )
-                {
+                ) {
                     maxDistance *= 2;
-                }
-                else
-                {
+                } else {
                     break;
                 }
             }
-            if (!AreBoundsInViewAtDistance(camera, objectBounds, maxDistance, minSlack: minSlack))
-            {
+            if (!AreBoundsInViewAtDistance(camera, objectBounds, maxDistance, minSlack: minSlack)) {
                 return -1.0f;
             }
 
             float targetAccuracy = 0.01f; // How close we need to get to the answer
-            while (minDistance < maxDistance - targetAccuracy)
-            {
+            while (minDistance < maxDistance - targetAccuracy) {
                 float midDistance = (minDistance + maxDistance) / 2;
                 Debug.Log(midDistance);
                 if (
                     AreBoundsInViewAtDistance(camera, objectBounds, midDistance, minSlack: minSlack)
-                )
-                {
+                ) {
                     maxDistance = midDistance;
-                }
-                else
-                {
+                } else {
                     minDistance = midDistance;
                 }
             }
@@ -9637,8 +8532,7 @@ protected IEnumerator renderObjectFromAngles(
             Vector2 renderResolution,
             float[] angles,
             float cameraHeightMultiplier
-        )
-        {
+        ) {
             // Save the original camera settings
             Vector3 originalPosition = renderCamera.transform.position;
             Quaternion originalRotation = renderCamera.transform.rotation;
@@ -9647,12 +8541,10 @@ float cameraHeightMultiplier
             // Calculate bounds of the target object
             Renderer[] renderers = targetObject.GetComponentsInChildren<Renderer>();
             Bounds bounds = new Bounds(targetObject.transform.position, Vector3.zero);
-            foreach (Renderer renderer in renderers)
-            {
+            foreach (Renderer renderer in renderers) {
                 bounds.Encapsulate(renderer.bounds);
             }
-            foreach (Collider c in targetObject.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in targetObject.GetComponentsInChildren<Collider>()) {
                 bounds.Encapsulate(c.bounds);
             }
 
@@ -9670,8 +8562,7 @@ float cameraHeightMultiplier
             renderCamera.targetTexture = renderTexture;
 
             List<byte[]> byte_arrays = new List<byte[]>();
-            foreach (float angle in angles)
-            {
+            foreach (float angle in angles) {
                 // Calculate camera position for 3/4 view
                 float radians = (90f - angle) * Mathf.Deg2Rad;
                 Vector3 cameraPosition = new Vector3(
@@ -9685,8 +8576,7 @@ float cameraHeightMultiplier
 
                 float dist = FindClosestDistance(renderCamera, bounds, minSlack: 0.025f);
 
-                if (dist < 0)
-                {
+                if (dist < 0) {
                     errorMessage = "Could not find a suitable distance to render the object.";
                     byte_arrays = null;
                     break;
@@ -9735,15 +8625,11 @@ public void RenderObjectFromAngles(
             Vector2 renderResolution,
             float[] angles,
             float cameraHeightMultiplier = 0.5f
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = "No object with ID " + objectId;
                 actionFinished(false, errorMessage: errorMessage);
-            }
-            else
-            {
+            } else {
                 StartCoroutine(
                     renderObjectFromAngles(
                         renderCamera: m_Camera,
@@ -9758,11 +8644,9 @@ public void RenderObjectFromAngles(
             }
         }
 
-        public void RemoveObject(string objectId)
-        {
+        public void RemoveObject(string objectId) {
             var obj = GameObject.Find(objectId);
-            if (obj == null)
-            {
+            if (obj == null) {
                 errorMessage = $"Object does not exist in scene.";
                 actionFinishedEmit(false);
                 return;
@@ -9776,11 +8660,9 @@ public void RotateObject(
             FlexibleRotation angleAxisRotation,
             string objectId = "asset_0",
             bool absolute = true
-        )
-        {
+        ) {
             var obj = GameObject.Find(objectId);
-            if (obj == null)
-            {
+            if (obj == null) {
                 errorMessage = $"Object does not exist in scene.";
                 actionFinishedEmit(false);
                 return;
@@ -9788,8 +8670,7 @@ public void RotateObject(
             var bounds = GetObjectSphereBounds(obj);
             //obj.transform.RotateAround()
             var rot = Quaternion.AngleAxis(angleAxisRotation.degrees, angleAxisRotation.axis);
-            if (absolute)
-            {
+            if (absolute) {
                 obj.transform.position = Vector3.zero;
                 obj.transform.rotation = Quaternion.identity;
                 obj.transform.RotateAround(
@@ -9797,9 +8678,7 @@ public void RotateObject(
                     angleAxisRotation.axis,
                     angleAxisRotation.degrees
                 );
-            }
-            else
-            {
+            } else {
                 obj.transform.RotateAround(
                     bounds.center,
                     angleAxisRotation.axis,
@@ -9811,11 +8690,9 @@ public void RotateObject(
             actionFinished(true);
         }
 
-        public void BakeNavMesh()
-        {
+        public void BakeNavMesh() {
             var navmesh = GameObject.FindObjectOfType<NavMeshSurface>();
-            if (navmesh == null)
-            {
+            if (navmesh == null) {
                 actionFinishedEmit(
                     false,
                     null,
@@ -9828,15 +8705,12 @@ public void BakeNavMesh()
             actionFinishedEmit(true);
         }
 
-        public void OverwriteNavMeshes(List<NavMeshConfig> navMeshConfigs)
-        {
+        public void OverwriteNavMeshes(List<NavMeshConfig> navMeshConfigs) {
             var navmesh = GameObject.FindObjectOfType<NavMeshSurfaceExtended>();
             Transform parent;
-            if (navmesh == null)
-            {
+            if (navmesh == null) {
                 var go = GameObject.Find(ProceduralTools.NavMeshSurfaceParent());
-                if (go == null)
-                {
+                if (go == null) {
                     actionFinishedEmit(
                         false,
                         null,
@@ -9845,15 +8719,12 @@ public void OverwriteNavMeshes(List<NavMeshConfig> navMeshConfigs)
                     return;
                 }
                 parent = go.transform;
-            }
-            else
-            {
+            } else {
                 parent = navmesh.transform.parent;
             }
             var floorGo = parent.parent;
 
-            for (var i = 0; i < parent.transform.childCount; i++)
-            {
+            for (var i = 0; i < parent.transform.childCount; i++) {
                 var navmeshObj = parent.transform.GetChild(i);
                 var navMeshSurf = navmeshObj.GetComponent<NavMeshSurfaceExtended>();
                 navMeshSurf.RemoveData();
@@ -9865,11 +8736,9 @@ public void OverwriteNavMeshes(List<NavMeshConfig> navMeshConfigs)
             actionFinishedEmit(success: true);
         }
 
-        public void ReBakeNavMeshes(List<NavMeshConfig> navMeshConfigs = null)
-        {
+        public void ReBakeNavMeshes(List<NavMeshConfig> navMeshConfigs = null) {
             var navmeshes = GameObject.FindObjectsOfType<NavMeshSurfaceExtended>();
-            if (navmeshes == null || navmeshes.Count() == 0)
-            {
+            if (navmeshes == null || navmeshes.Count() == 0) {
                 actionFinishedEmit(
                     false,
                     null,
@@ -9877,38 +8746,29 @@ public void ReBakeNavMeshes(List<NavMeshConfig> navMeshConfigs = null)
                 );
                 return;
             }
-            if (navMeshConfigs != null && navMeshConfigs.Count != navmeshes.Count())
-            {
+            if (navMeshConfigs != null && navMeshConfigs.Count != navmeshes.Count()) {
                 actionFinishedEmit(
                     success: false,
                     errorMessage: $"Provided `navMeshConfigs` count does not match active navmeshSurfaces, provided: {navMeshConfigs.Count} current: {navmeshes.Count()}"
                 );
-            }
-            else if (navMeshConfigs != null)
-            {
-                for (var i = 0; i < navmeshes.Count(); i++)
-                {
+            } else if (navMeshConfigs != null) {
+                for (var i = 0; i < navmeshes.Count(); i++) {
                     navmeshes[i]
                         .BuildNavMesh(
                             ProceduralTools.navMeshConfigToBuildSettings(navMeshConfigs[i])
                         );
                 }
-            }
-            else
-            {
-                foreach (var navmesh in navmeshes)
-                {
+            } else {
+                foreach (var navmesh in navmeshes) {
                     navmesh.BuildNavMesh(navmesh.buildSettings);
                 }
             }
             actionFinishedEmit(success: true);
         }
 
-        public void GetNavMeshConfigs()
-        {
+        public void GetNavMeshConfigs() {
             var navmeshes = GameObject.FindObjectsOfType<NavMeshSurfaceExtended>();
-            if (navmeshes == null || navmeshes.Count() == 0)
-            {
+            if (navmeshes == null || navmeshes.Count() == 0) {
                 actionFinishedEmit(
                     false,
                     null,
@@ -9924,11 +8784,9 @@ public void GetNavMeshConfigs()
             );
         }
 
-        public void CreateNewNavMesh(NavMeshConfig navMeshConfig)
-        {
+        public void CreateNewNavMesh(NavMeshConfig navMeshConfig) {
             var navmesh = GameObject.FindObjectOfType<NavMeshSurfaceExtended>();
-            if (navmesh == null)
-            {
+            if (navmesh == null) {
                 actionFinishedEmit(
                     false,
                     null,
@@ -9948,21 +8806,16 @@ public void CreateNewNavMesh(NavMeshConfig navMeshConfig)
             actionFinishedEmit(true);
         }
 
-        public void OnTriggerStay(Collider other)
-        {
-            if (other.CompareTag("HighFriction"))
-            {
+        public void OnTriggerStay(Collider other) {
+            if (other.CompareTag("HighFriction")) {
                 inHighFrictionArea = true;
-            }
-            else
-            {
+            } else {
                 inHighFrictionArea = false;
             }
         }
 
         // use this to check if any given Vector3 coordinate is within the agent's viewport and also not obstructed
-        public bool CheckIfPointIsInViewport(Vector3 point)
-        {
+        public bool CheckIfPointIsInViewport(Vector3 point) {
             Vector3 viewPoint = m_Camera.WorldToViewportPoint(point);
 
             float ViewPointRangeHigh = 1.0f;
@@ -9996,13 +8849,10 @@ public bool CheckIfPointIsInViewport(Vector3 point)
                             "Agent"
                         )
                     )
-                )
-                {
+                ) {
                     updateAllAgentCollidersForVisibilityCheck(true);
                     return false;
-                }
-                else
-                {
+                } else {
                     updateAllAgentCollidersForVisibilityCheck(true);
                     return true;
                 }
@@ -10014,23 +8864,19 @@ protected List<Vector2> approxObjectMask(
             SimObjPhysics sop,
             int divisions,
             int? thirdPartyCameraIndex = null
-        )
-        {
-            if (divisions <= 2)
-            {
+        ) {
+            if (divisions <= 2) {
                 throw new ArgumentException("divisions must be >=3");
             }
             ObjectOrientedBoundingBox oobb = sop.ObjectOrientedBoundingBox;
 
-            if (oobb == null)
-            {
+            if (oobb == null) {
                 sop.syncBoundingBoxes(
                     forceCacheReset: true,
                     forceCreateObjectOrientedBoundingBox: true
                 );
                 oobb = sop.ObjectOrientedBoundingBox;
-                if (oobb == null)
-                {
+                if (oobb == null) {
                     throw new ArgumentException(
                         $"{sop.objectID} does not have an object oriented bounding box"
                     );
@@ -10039,8 +8885,7 @@ protected List<Vector2> approxObjectMask(
             float[][] oobbPoints = oobb.cornerPoints;
 
             Camera camera = m_Camera;
-            if (thirdPartyCameraIndex.HasValue)
-            {
+            if (thirdPartyCameraIndex.HasValue) {
                 camera = agentManager.thirdPartyCameras[thirdPartyCameraIndex.Value];
             }
 
@@ -10050,8 +8895,7 @@ protected List<Vector2> approxObjectMask(
             float minY = 1.0f;
             float maxY = 0.0f;
             float maxDist = 0.0f;
-            for (int i = 0; i < 8; i++)
-            {
+            for (int i = 0; i < 8; i++) {
                 Vector3 worldSpaceCornerPoint = new Vector3(
                     oobbPoints[i][0],
                     oobbPoints[i][1],
@@ -10075,8 +8919,7 @@ protected List<Vector2> approxObjectMask(
             maxY = Math.Min(maxY, 1f);
 
             List<Vector2> points = new List<Vector2>();
-            if (maxX - minX < 1e-3f || maxY - minY < 1e-3f)
-            {
+            if (maxX - minX < 1e-3f || maxY - minY < 1e-3f) {
                 return points;
             }
 
@@ -10090,10 +8933,8 @@ protected List<Vector2> approxObjectMask(
             float shrunkMinY = minY * (1 - alpha) + maxY * alpha;
             float shrunkMaxY = minY * alpha + maxY * (1 - alpha);
 
-            for (int i = 0; i < divisions; i++)
-            {
-                for (int j = 0; j < divisions; j++)
-                {
+            for (int i = 0; i < divisions; i++) {
+                for (int j = 0; j < divisions; j++) {
                     float x = shrunkMinX + (shrunkMaxX - shrunkMinX) * i / (divisions - 1);
                     float y = shrunkMinY + (shrunkMaxY - shrunkMinY) * j / (divisions - 1);
 
@@ -10107,8 +8948,7 @@ protected List<Vector2> approxObjectMask(
                             camera: camera,
                             includeInvisible: false
                         ).visible
-                    )
-                    {
+                    ) {
                         points.Add(new Vector2(x, y));
                     }
                 }
@@ -10120,8 +8960,7 @@ public void GetApproxObjectMask(
             string objectId,
             int divisions = 10,
             int? thirdPartyCameraIndex = null
-        )
-        {
+        ) {
             SimObjPhysics sop = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
@@ -10134,13 +8973,11 @@ public void GetApproxObjectMask(
             actionFinishedEmit(success: true, actionReturn: points);
         }
 
-        public void unrollSimulatePhysics(IEnumerator enumerator, float fixedDeltaTime)
-        {
+        public void unrollSimulatePhysics(IEnumerator enumerator, float fixedDeltaTime) {
             ContinuousMovement.unrollSimulatePhysics(enumerator, fixedDeltaTime);
         }
 
-        public void GetSceneBounds()
-        {
+        public void GetSceneBounds() {
             Vector3[] positions = new Vector3[2];
             positions[0] = agentManager.SceneBounds.min;
             positions[1] = agentManager.SceneBounds.max;
@@ -10152,8 +8989,7 @@ public void GetSceneBounds()
             actionFinishedEmit(true, positions);
         }
 
-        public void GetLights()
-        {
+        public void GetLights() {
             print("GetLights in BASE happening now");
             //debug
 #if UNITY_EDITOR
@@ -10164,34 +9000,29 @@ public void GetLights()
             actionFinishedEmit(true, UtilityFunctions.GetLightPropertiesOfScene());
         }
 
-        public void SetLights()
-        {
+        public void SetLights() {
             //check that name of light specified exists in scene, if not throw exception
 
             actionFinished(true);
         }
 
-        public void GetPhysicsSimulateCount()
-        {
+        public void GetPhysicsSimulateCount() {
             actionFinished(
                 success: true,
                 actionReturn: PhysicsSceneManager.PhysicsSimulateCallCount
             );
         }
 
-        public void GetLastPhysicsSimulateCount()
-        {
+        public void GetLastPhysicsSimulateCount() {
             actionFinished(
                 success: true,
                 actionReturn: PhysicsSceneManager.LastPhysicsSimulateCallCount
             );
         }
 
-        public void SetObjectsCollisionMode(string collisionDetectionMode)
-        {
+        public void SetObjectsCollisionMode(string collisionDetectionMode) {
             var rootObject = GameObject.Find(ProceduralTools.DefaultObjectsRootName);
-            if (rootObject == null)
-            {
+            if (rootObject == null) {
                 actionFinished(
                     success: false,
                     errorMessage: $"No root object '{ProceduralTools.DefaultObjectsRootName}', make sure it's a procedural scene and house created when running this action."
@@ -10200,12 +9031,10 @@ public void SetObjectsCollisionMode(string collisionDetectionMode)
             CollisionDetectionMode collDet = CollisionDetectionMode.ContinuousSpeculative;
 
             Enum.TryParse(collisionDetectionMode, true, out collDet);
-            for (var i = 0; i < rootObject.transform.childCount; i++)
-            {
+            for (var i = 0; i < rootObject.transform.childCount; i++) {
                 var obj = rootObject.transform.GetChild(i);
                 var rb = obj.GetComponent<Rigidbody>();
-                if (!rb.isKinematic)
-                {
+                if (!rb.isKinematic) {
                     rb.collisionDetectionMode = collDet;
                 }
             }
@@ -10213,8 +9042,7 @@ public void SetObjectsCollisionMode(string collisionDetectionMode)
         }
 
 #if UNITY_EDITOR
-        void OnDrawGizmos()
-        {
+        void OnDrawGizmos() {
             //// check for valid spawn points in GetSpawnCoordinatesAboveObject action
             // Gizmos.color = Color.magenta;
             // if(validpointlist.Count > 0)
@@ -10245,33 +9073,27 @@ void OnDrawGizmos()
         }
 #endif
 
-        public void TestActionDispatchSAAmbig2(float foo, bool def = false)
-        {
+        public void TestActionDispatchSAAmbig2(float foo, bool def = false) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchSAAmbig2(float foo)
-        {
+        public void TestActionDispatchSAAmbig2(float foo) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchSAAmbig(ServerAction action)
-        {
+        public void TestActionDispatchSAAmbig(ServerAction action) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchSAAmbig(float foo)
-        {
+        public void TestActionDispatchSAAmbig(float foo) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchNoopServerAction(ServerAction action)
-        {
+        public void TestActionDispatchNoopServerAction(ServerAction action) {
             actionFinished(true, "serveraction");
         }
 
-        public void TestFastEmit(string rvalue)
-        {
+        public void TestFastEmit(string rvalue) {
             actionFinishedEmit(true, rvalue);
         }
 
@@ -10279,129 +9101,105 @@ public void TestActionDispatchNoopAllDefault2(
             float param12,
             float param10 = 0.0f,
             float param11 = 1.0f
-        )
-        {
+        ) {
             actionFinished(true, "somedefault");
         }
 
-        public void TestActionDispatchNoopAllDefault(float param10 = 0.0f, float param11 = 1.0f)
-        {
+        public void TestActionDispatchNoopAllDefault(float param10 = 0.0f, float param11 = 1.0f) {
             actionFinished(true, "alldefault");
         }
 
-        public void TestActionDispatchNoop2(bool param3, string param4 = "foo")
-        {
+        public void TestActionDispatchNoop2(bool param3, string param4 = "foo") {
             actionFinished(true, "param3 param4/default " + param4);
         }
 
-        public void TestActionReflectParam(string rvalue)
-        {
+        public void TestActionReflectParam(string rvalue) {
             actionFinished(true, rvalue);
         }
 
-        public void TestActionDispatchNoop(string param6, string param7)
-        {
+        public void TestActionDispatchNoop(string param6, string param7) {
             actionFinished(true, "param6 param7");
         }
 
-        public void TestActionDispatchNoop(bool param1, bool param2)
-        {
+        public void TestActionDispatchNoop(bool param1, bool param2) {
             actionFinished(true, "param1 param2");
         }
 
-        public void TestActionDispatchConflict(string param22)
-        {
+        public void TestActionDispatchConflict(string param22) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchConflict(bool param22)
-        {
+        public void TestActionDispatchConflict(bool param22) {
             actionFinished(true);
         }
 
-        public void TestActionDispatchNoop(bool param1)
-        {
+        public void TestActionDispatchNoop(bool param1) {
             actionFinished(true, "param1");
         }
 
-        public void TestActionDispatchNoop()
-        {
+        public void TestActionDispatchNoop() {
             actionFinished(true, "emptyargs");
         }
 
-        public void TestActionDispatchFindAmbiguous(string typeName)
-        {
+        public void TestActionDispatchFindAmbiguous(string typeName) {
             List<string> actions = ActionDispatcher.FindAmbiguousActions(Type.GetType(typeName));
             actionFinished(true, actions);
         }
 
-        public void TestActionDispatchFindConflicts(string typeName)
-        {
+        public void TestActionDispatchFindConflicts(string typeName) {
             Dictionary<string, List<string>> conflicts =
                 ActionDispatcher.FindMethodVariableNameConflicts(Type.GetType(typeName));
             string[] ignore = new string[] { "GetComponent", "StopCoroutine" };
-            foreach (var methodName in ignore)
-            {
-                if (conflicts.ContainsKey(methodName))
-                {
+            foreach (var methodName in ignore) {
+                if (conflicts.ContainsKey(methodName)) {
                     conflicts.Remove(methodName);
                 }
             }
             actionFinished(true, conflicts);
         }
 
-        public void print(string message)
-        {
+        public void print(string message) {
             MonoBehaviour.print(message);
         }
 
         public T GetComponent<T>()
-            where T : Component
-        {
+            where T : Component {
             return this.baseAgentComponent.GetComponent<T>();
         }
 
         public T GetComponentInParent<T>()
-            where T : Component
-        {
+            where T : Component {
             return this.baseAgentComponent.GetComponentInParent<T>();
         }
 
         public T GetComponentInChildren<T>()
-            where T : Component
-        {
+            where T : Component {
             return this.baseAgentComponent.GetComponentInChildren<T>();
         }
 
         public T[] GetComponentsInChildren<T>()
-            where T : Component
-        {
+            where T : Component {
             return this.baseAgentComponent.GetComponentsInChildren<T>();
         }
 
-        public GameObject Instantiate(GameObject original)
-        {
+        public GameObject Instantiate(GameObject original) {
             return UnityEngine.Object.Instantiate(original);
         }
 
-        public GameObject Instantiate(GameObject original, Vector3 position, Quaternion rotation)
-        {
+        public GameObject Instantiate(GameObject original, Vector3 position, Quaternion rotation) {
             return UnityEngine.Object.Instantiate(original, position, rotation);
         }
 
-        public void Destroy(GameObject targetObject)
-        {
+        public void Destroy(GameObject targetObject) {
             MonoBehaviour.Destroy(targetObject);
         }
     }
 
-    public class VisibilityCheck
-    {
+    public class VisibilityCheck {
         public bool visible;
         public bool interactable;
 
-        public static VisibilityCheck operator |(VisibilityCheck a, VisibilityCheck b)
-        {
+        public static VisibilityCheck operator |(VisibilityCheck a, VisibilityCheck b) {
             VisibilityCheck c = new VisibilityCheck();
             c.interactable = a.interactable || b.interactable;
             c.visible = a.visible || b.visible;
diff --git a/unity/Assets/Scripts/BatchRename.cs b/unity/Assets/Scripts/BatchRename.cs
index 185676e429..2339dc1ca0 100644
--- a/unity/Assets/Scripts/BatchRename.cs
+++ b/unity/Assets/Scripts/BatchRename.cs
@@ -5,8 +5,7 @@
 using UnityEditor;
 using System.Collections;
 
-public class BatchRename : ScriptableWizard
-{
+public class BatchRename : ScriptableWizard {
     /// <summary>
     /// Base name
     /// </summary>
@@ -23,36 +22,31 @@ public class BatchRename : ScriptableWizard
     public int Increment = 1;
 
     [MenuItem("Edit/Batch Rename...")]
-    static void CreateWizard()
-    {
+    static void CreateWizard() {
         ScriptableWizard.DisplayWizard("Batch Rename", typeof(BatchRename), "Rename");
     }
 
     /// <summary>
     /// Called when the window first appears
     /// </summary>
-    void OnEnable()
-    {
+    void OnEnable() {
         UpdateSelectionHelper();
     }
 
     /// <summary>
     /// Function called when selection changes in scene
     /// </summary>
-    void OnSelectionChange()
-    {
+    void OnSelectionChange() {
         UpdateSelectionHelper();
     }
 
     /// <summary>
     /// Update selection counter
     /// </summary>
-    void UpdateSelectionHelper()
-    {
+    void UpdateSelectionHelper() {
         helpString = "";
 
-        if (Selection.objects != null)
-        {
+        if (Selection.objects != null) {
             helpString = "Number of objects selected: " + Selection.objects.Length;
         }
     }
@@ -60,11 +54,9 @@ void UpdateSelectionHelper()
     /// <summary>
     /// Rename
     /// </summary>
-    void OnWizardCreate()
-    {
+    void OnWizardCreate() {
         // If selection is empty, then exit
-        if (Selection.objects == null)
-        {
+        if (Selection.objects == null) {
             return;
         }
 
@@ -72,8 +64,7 @@ void OnWizardCreate()
         int PostFix = StartNumber;
 
         // Cycle and rename
-        foreach (Object O in Selection.objects)
-        {
+        foreach (Object O in Selection.objects) {
             O.name = BaseName + PostFix;
             PostFix += Increment;
         }
diff --git a/unity/Assets/Scripts/Bathtub.cs b/unity/Assets/Scripts/Bathtub.cs
index c794545cae..9d5df6b326 100644
--- a/unity/Assets/Scripts/Bathtub.cs
+++ b/unity/Assets/Scripts/Bathtub.cs
@@ -3,26 +3,21 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Bathtub : MonoBehaviour
-{
+public class Bathtub : MonoBehaviour {
     public SimObj ParentObj;
     public bool EditorFilled = false;
     public GameObject FilledObject;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
         ParentObj.Type = SimObjType.Bathtub;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
@@ -30,16 +25,13 @@ void OnEnable()
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool filled = EditorFilled;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             filled = ParentObj.Animator.GetBool("AnimState1");
         }
 
-        if (FilledObject == null)
-        {
+        if (FilledObject == null) {
             Debug.LogError("Filled object is null in bathtub");
             return;
         }
diff --git a/unity/Assets/Scripts/Bed.cs b/unity/Assets/Scripts/Bed.cs
index 774dc2d89a..b58881b5a4 100644
--- a/unity/Assets/Scripts/Bed.cs
+++ b/unity/Assets/Scripts/Bed.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Bed : MonoBehaviour
-{
+public class Bed : MonoBehaviour {
     public SimObj ParentObj;
 
     // public GameObject FittedSheet;
@@ -14,20 +13,16 @@ public class Bed : MonoBehaviour
     [Range(0, 2)]
     public int EditorState = 0;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
         ParentObj.Type = SimObjType.Bed;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("StateAnimController") as RuntimeAnimatorController;
@@ -35,11 +30,9 @@ void OnEnable()
         }
     }
 
-    void Update()
-    {
+    void Update() {
         int state = EditorState;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             state = ParentObj.Animator.GetInteger("AnimState1");
         }
 
@@ -47,8 +40,7 @@ void Update()
         // 1 - clean, no sheet
         // 2 - clean, sheet
 
-        switch (state)
-        {
+        switch (state) {
             case 0:
             default:
                 MessyBlanket.SetActive(true);
diff --git a/unity/Assets/Scripts/Blinds.cs b/unity/Assets/Scripts/Blinds.cs
index f7dee207d7..6728a8de77 100644
--- a/unity/Assets/Scripts/Blinds.cs
+++ b/unity/Assets/Scripts/Blinds.cs
@@ -3,53 +3,42 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Blinds : MonoBehaviour
-{
+public class Blinds : MonoBehaviour {
     public SimObj ParentObj;
     public bool EditorOpen = false;
     public bool OpenByDefault = true;
     public GameObject OpenObject;
     public GameObject ClosedObject;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         EditorOpen = OpenByDefault;
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
         ParentObj.Type = SimObjType.Blinds;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
             }
-        }
-        else
-        {
-            if (OpenByDefault)
-            {
+        } else {
+            if (OpenByDefault) {
                 ParentObj.Animator.SetBool("AnimState1", true);
             }
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool open = EditorOpen;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             open = ParentObj.Animator.GetBool("AnimState1");
         }
 
-        if (OpenObject == null || ClosedObject == null)
-        {
+        if (OpenObject == null || ClosedObject == null) {
             Debug.LogError("Open or closed object is null in blinds");
             return;
         }
diff --git a/unity/Assets/Scripts/Box.cs b/unity/Assets/Scripts/Box.cs
index 0036d71031..d8a4dc27d4 100644
--- a/unity/Assets/Scripts/Box.cs
+++ b/unity/Assets/Scripts/Box.cs
@@ -3,22 +3,17 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Box : MonoBehaviour
-{
+public class Box : MonoBehaviour {
     public SimObj ParentSimObj;
     public GameObject[] Lids;
     public bool EditorClosed = true;
 
-    void OnEnable()
-    {
-        if (Application.isPlaying)
-        {
+    void OnEnable() {
+        if (Application.isPlaying) {
             ParentSimObj.Animator.SetBool("AnimState1", false);
-            foreach (GameObject lid in Lids)
-            {
+            foreach (GameObject lid in Lids) {
                 Renderer r = lid.GetComponent<MeshRenderer>();
-                if (r != null)
-                {
+                if (r != null) {
                     bool lighten = SceneManager.Current.SceneNumber % 2 == 0;
                     Material darkerMat = r.material;
                     darkerMat.color = Color.Lerp(
@@ -31,20 +26,15 @@ void OnEnable()
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool closed = false;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             closed = !ParentSimObj.Animator.GetBool("AnimState1");
-        }
-        else
-        {
+        } else {
             closed = EditorClosed;
         }
 
-        foreach (GameObject lid in Lids)
-        {
+        foreach (GameObject lid in Lids) {
             lid.SetActive(closed);
         }
     }
diff --git a/unity/Assets/Scripts/Break.cs b/unity/Assets/Scripts/Break.cs
index 8a95ec2c7d..478a947659 100644
--- a/unity/Assets/Scripts/Break.cs
+++ b/unity/Assets/Scripts/Break.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class Break : MonoBehaviour
-{
+public class Break : MonoBehaviour {
     [SerializeField]
     private GameObject PrefabToSwapTo = null;
 
@@ -30,8 +29,7 @@ public class Break : MonoBehaviour
 
     // what does this object need to do when it is in the broken state?
     // Some need a decal to show a cracked screen on the surface, others need a prefab swap to shattered pieces
-    protected enum BreakType
-    {
+    protected enum BreakType {
         PrefabSwap,
         MaterialSwap,
         Decal
@@ -74,14 +72,12 @@ protected enum BreakType
         SimObjType.HandTowel
     };
 
-    public bool isBroken()
-    {
+    public bool isBroken() {
         return broken;
     }
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
 #if UNITY_EDITOR
         // TODO refactor Break logic as separate from DecalCollision.cs to avoid error, and remove last part of AND
         if (
@@ -91,15 +87,12 @@ void Start()
                     .GetComponentInParent<SimObjPhysics>()
                     .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBreak)
             ) && !gameObject.GetComponentInParent<SimObjPhysics>().IsReceptacle
-        )
-        {
+        ) {
             Debug.LogError(gameObject.name + " is missing the CanBreak secondary property!");
         }
 
-        if (gameObject.GetComponent<Dirty>())
-        {
-            if (DirtyPrefabToSwapTo == null)
-            {
+        if (gameObject.GetComponent<Dirty>()) {
+            if (DirtyPrefabToSwapTo == null) {
                 Debug.LogError(gameObject.name + " is missing a DirtyPrefabToSpawnTo!");
             }
         }
@@ -108,11 +101,9 @@ void Start()
         CurrentImpulseThreshold = ImpulseThreshold;
     }
 
-    public void BreakObject(Collision collision)
-    {
+    public void BreakObject(Collision collision) {
         // prefab swap will switch the entire object out with a new prefab object entirely
-        if (breakType == BreakType.PrefabSwap)
-        {
+        if (breakType == BreakType.PrefabSwap) {
             // Disable this game object and spawn in the broken pieces
             Rigidbody rb = gameObject.GetComponent<Rigidbody>();
 
@@ -120,18 +111,14 @@ public void BreakObject(Collision collision)
             Transform objectsTransform = GameObject.Find("Objects").transform;
 
             //before disabling things, if this object is a receptacle, unparent all objects contained
-            if (gameObject.GetComponent<SimObjPhysics>().IsReceptacle)
-            {
+            if (gameObject.GetComponent<SimObjPhysics>().IsReceptacle) {
                 foreach (
                     GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
-                )
-                {
+                ) {
                     //only reset rigidbody properties if contained object was pickupable/moveable
-                    if (go.GetComponentInParent<SimObjPhysics>())
-                    {
+                    if (go.GetComponentInParent<SimObjPhysics>()) {
                         SimObjPhysics containedSOP = go.GetComponentInParent<SimObjPhysics>();
-                        if (containedSOP.IsMoveable || containedSOP.IsPickupable)
-                        {
+                        if (containedSOP.IsMoveable || containedSOP.IsPickupable) {
                             go.transform.SetParent(objectsTransform);
                             Rigidbody childrb = go.GetComponent<Rigidbody>();
                             childrb.isKinematic = false;
@@ -145,8 +132,7 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
             }
 
             // turn off everything except the top object
-            foreach (Transform t in gameObject.transform)
-            {
+            foreach (Transform t in gameObject.transform) {
                 t.gameObject.SetActive(false);
             }
 
@@ -156,11 +142,9 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
             // if gameObject.GetComponent<Dirty>() - first check to make sure if this object can become dirty
             // if object is dirty - probably get this from the "Dirty" component to keep everything nice and self contained
             // PrefabToSwapTo = DirtyPrefabToSwapTo
-            if (gameObject.GetComponent<Dirty>())
-            {
+            if (gameObject.GetComponent<Dirty>()) {
                 // if the object is not clean, swap to the dirty prefab
-                if (gameObject.GetComponent<Dirty>().IsDirty())
-                {
+                if (gameObject.GetComponent<Dirty>().IsDirty()) {
                     PrefabToSwapTo = DirtyPrefabToSwapTo;
                 }
             }
@@ -174,8 +158,7 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
             broken = true;
 
             // ContactPoint cp = collision.GetContact(0);
-            foreach (Rigidbody subRb in resultObject.GetComponentsInChildren<Rigidbody>())
-            {
+            foreach (Rigidbody subRb in resultObject.GetComponentsInChildren<Rigidbody>()) {
                 subRb.velocity = rb.velocity * 0.4f;
                 subRb.angularVelocity = rb.angularVelocity * 0.4f;
             }
@@ -185,10 +168,8 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
 
             // if this object breaking is an egg, set rotation for the EggCracked object
             // quick if the result object is an egg hard set it's rotation because EGGS ARE WEIRD and are not the same form as their shelled version
-            if (resultObject.GetComponent<SimObjPhysics>())
-            {
-                if (resultObject.GetComponent<SimObjPhysics>().Type == SimObjType.EggCracked)
-                {
+            if (resultObject.GetComponent<SimObjPhysics>()) {
+                if (resultObject.GetComponent<SimObjPhysics>().Type == SimObjType.EggCracked) {
                     resultObject.transform.rotation = Quaternion.Euler(Vector3.zero);
                     PhysicsSceneManager psm = GameObject
                         .Find("PhysicsSceneManager")
@@ -210,21 +191,17 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
         }
 
         // if decal type, do not switch out the object but instead swap materials to show cracked/broken parts
-        if (breakType == BreakType.MaterialSwap)
-        {
+        if (breakType == BreakType.MaterialSwap) {
             // decal logic here
-            if (MaterialSwapObjects.Length > 0)
-            {
-                for (int i = 0; i < MaterialSwapObjects.Length; i++)
-                {
+            if (MaterialSwapObjects.Length > 0) {
+                for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                     MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                         MaterialSwapObjects[i].OnMaterials;
                 }
             }
 
             // if the object can be toggled on/off, if it is on, turn it off since it is now broken
-            if (gameObject.GetComponent<CanToggleOnOff>())
-            {
+            if (gameObject.GetComponent<CanToggleOnOff>()) {
                 gameObject.GetComponent<CanToggleOnOff>().isOn = false;
             }
 
@@ -233,8 +210,7 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
             readytobreak = false;
         }
 
-        if (breakType == BreakType.Decal)
-        {
+        if (breakType == BreakType.Decal) {
             // move shattered decal to location of the collision, or if there was no collision and this is being called
             // directly from the Break() action, create a default decal i guess?
             BreakForDecalType(collision);
@@ -244,10 +220,8 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
             .Find("PhysicsSceneManager")
             .GetComponent<AgentManager>()
             .PrimaryAgent;
-        if (primaryAgent.imageSynthesis)
-        {
-            if (primaryAgent.imageSynthesis.enabled)
-            {
+        if (primaryAgent.imageSynthesis) {
+            if (primaryAgent.imageSynthesis.enabled) {
                 primaryAgent.imageSynthesis.OnSceneChange();
             }
         }
@@ -256,11 +230,9 @@ GameObject go in gameObject.GetComponent<SimObjPhysics>().ContainedGameObjects()
     // Override for Decal behavior
     protected virtual void BreakForDecalType(Collision collision) { }
 
-    void OnCollisionEnter(Collision col)
-    {
+    void OnCollisionEnter(Collision col) {
         // do nothing if this specific breakable sim objects has been set to unbreakable
-        if (Unbreakable)
-        {
+        if (Unbreakable) {
             return;
         }
 
@@ -271,14 +243,12 @@ void OnCollisionEnter(Collision col)
         // }
 
         // if the other collider hit is on the list of things that shouldn't cause this object to break, return and do nothing
-        if (col.transform.GetComponentInParent<SimObjPhysics>())
-        {
+        if (col.transform.GetComponentInParent<SimObjPhysics>()) {
             if (
                 TooSmalOrSoftToBreakOtherObjects.Contains(
                     col.transform.GetComponentInParent<SimObjPhysics>().Type
                 )
-            )
-            {
+            ) {
                 return;
             }
         }
@@ -287,10 +257,8 @@ void OnCollisionEnter(Collision col)
         if (
             col.impulse.magnitude > CurrentImpulseThreshold
             && !col.transform.GetComponentInParent<BaseAgentComponent>()
-        )
-        {
-            if (readytobreak)
-            {
+        ) {
+            if (readytobreak) {
                 readytobreak = false;
                 BreakObject(col);
             }
@@ -299,18 +267,14 @@ void OnCollisionEnter(Collision col)
 
     // change the ImpulseThreshold to higher if we are in a high friction zone, to simulate throwing an object at a "soft" object requiring
     // more force to break - ie: dropping mug on floor vs on a rug
-    public void OnTriggerEnter(Collider other)
-    {
-        if (other.CompareTag("HighFriction"))
-        {
+    public void OnTriggerEnter(Collider other) {
+        if (other.CompareTag("HighFriction")) {
             CurrentImpulseThreshold = ImpulseThreshold + HighFrictionImpulseOffset;
         }
     }
 
-    public void OnTriggerExit(Collider other)
-    {
-        if (other.CompareTag("HighFriction"))
-        {
+    public void OnTriggerExit(Collider other) {
+        if (other.CompareTag("HighFriction")) {
             CurrentImpulseThreshold = ImpulseThreshold;
         }
     }
diff --git a/unity/Assets/Scripts/Breakdown.cs b/unity/Assets/Scripts/Breakdown.cs
index 08f2c13b87..8efdf7ca5b 100644
--- a/unity/Assets/Scripts/Breakdown.cs
+++ b/unity/Assets/Scripts/Breakdown.cs
@@ -5,21 +5,17 @@
 // this logic is for controlling how pieces shatter after spawning in a broken version of a sim object (mug, plate, etc)
 // this should be placed on the gameobject transform that is holding all of the shattered pieces
 // the pieces should only have rigidbodies and colliders
-public class Breakdown : MonoBehaviour
-{
+public class Breakdown : MonoBehaviour {
     public float power = 10.0f;
     protected float explosionRadius = 0.25f;
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
         Vector3 explosionPos = transform.position;
         Collider[] colliders = Physics.OverlapSphere(explosionPos, explosionRadius);
 
-        foreach (Collider col in colliders)
-        {
-            if (col.GetComponent<Rigidbody>())
-            {
+        foreach (Collider col in colliders) {
+            if (col.GetComponent<Rigidbody>()) {
                 Rigidbody rb = col.GetComponent<Rigidbody>();
                 rb.AddExplosionForce(power, gameObject.transform.position, explosionRadius, 0.005f);
                 rb.AddTorque(new Vector3(Random.value, Random.value, Random.value));
diff --git a/unity/Assets/Scripts/Cabinet.cs b/unity/Assets/Scripts/Cabinet.cs
index 8678825080..f7a1be722a 100644
--- a/unity/Assets/Scripts/Cabinet.cs
+++ b/unity/Assets/Scripts/Cabinet.cs
@@ -2,8 +2,7 @@
 using System.Collections;
 using UnityEngine;
 
-public enum CabinetOpenStyle
-{
+public enum CabinetOpenStyle {
     SingleDoorLeft,
     SingleDoorRight,
     DoubleDoors,
@@ -11,8 +10,7 @@ public enum CabinetOpenStyle
 }
 
 [ExecuteInEditMode]
-public class Cabinet : MonoBehaviour
-{
+public class Cabinet : MonoBehaviour {
     public bool Animate = false;
     public bool Open;
     public SimObj ParentObj;
@@ -68,14 +66,11 @@ center and expands so that the Agent can see what is inside the drawer.
     // bool lastOpen = false;
     float animatingDistance;
 
-    public void OnEnable()
-    {
+    public void OnEnable() {
         ParentObj.Manipulation = SimObjManipType.StaticNoPlacement;
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
@@ -83,47 +78,39 @@ public void OnEnable()
         }
     }
 
-    public void Update()
-    {
+    public void Update() {
         bool open = Open;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             // get whether we're open from our animation state
-            if (!ParentObj.IsAnimated)
-            {
+            if (!ParentObj.IsAnimated) {
                 return;
             }
             open = ParentObj.Animator.GetBool("AnimState1");
         }
 
-        if (!Application.isPlaying && !Animate)
-        {
+        if (!Application.isPlaying && !Animate) {
             return;
         }
 
-        switch (SceneManager.Current.AnimationMode)
-        {
+        switch (SceneManager.Current.AnimationMode) {
             case SceneAnimationMode.Instant:
             default:
                 UpdateAnimationInstant(open);
                 break;
 
             case SceneAnimationMode.Smooth:
-                if (Application.isPlaying)
-                {
+                if (Application.isPlaying) {
                     UpdateAnimationSmooth(open);
                 }
                 break;
         }
     }
 
-    void UpdateAnimationSmooth(bool open)
-    {
+    void UpdateAnimationSmooth(bool open) {
         Quaternion rightDoorStartRotation = Quaternion.identity;
         Quaternion leftDoorStartRotation = Quaternion.identity;
 
-        switch (OpenStyle)
-        {
+        switch (OpenStyle) {
             case CabinetOpenStyle.DoubleDoors:
                 rightDoorStartRotation = RightDoor.rotation;
                 leftDoorStartRotation = LeftDoor.rotation;
@@ -203,28 +190,22 @@ void UpdateAnimationSmooth(bool open)
                 break;
         }
 
-        if (animatingDistance >= 360f)
-        {
+        if (animatingDistance >= 360f) {
             animatingDistance -= 360f;
         }
 
         ParentObj.IsAnimating = (animatingDistance > 0.0025f);
     }
 
-    void UpdateAnimationInstant(bool open)
-    {
-        if (VisCollider)
-        {
+    void UpdateAnimationInstant(bool open) {
+        if (VisCollider) {
             VisCollider.gameObject.SetActive(open);
-        }
-        else
-        {
+        } else {
             // this handles Cabinets
             ParentObj.Receptacle.VisibilityCollider.gameObject.SetActive(open);
         }
 
-        switch (OpenStyle)
-        {
+        switch (OpenStyle) {
             case CabinetOpenStyle.DoubleDoors:
                 RightDoor.transform.localEulerAngles = open ? OpenAngleRight : ClosedAngleRight;
                 LeftDoor.transform.localEulerAngles = open ? OpenAngleLeft : ClosedAngleLeft;
diff --git a/unity/Assets/Scripts/CameraControls.cs b/unity/Assets/Scripts/CameraControls.cs
index 35076659c3..43b474df43 100644
--- a/unity/Assets/Scripts/CameraControls.cs
+++ b/unity/Assets/Scripts/CameraControls.cs
@@ -2,20 +2,16 @@
 using System.Collections;
 using UnityEngine;
 
-public class CameraControls : MonoBehaviour
-{
+public class CameraControls : MonoBehaviour {
     Camera cam;
 
-    void Start()
-    {
+    void Start() {
         cam = GetComponent<Camera>();
         cam.enabled = false;
     }
 
-    void Update()
-    {
-        if (Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.KeypadEnter))
-        {
+    void Update() {
+        if (Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.KeypadEnter)) {
             cam.enabled = !cam.enabled;
         }
     }
diff --git a/unity/Assets/Scripts/CameraDepthSetup.cs b/unity/Assets/Scripts/CameraDepthSetup.cs
index 013b3b19c3..b27b3920db 100644
--- a/unity/Assets/Scripts/CameraDepthSetup.cs
+++ b/unity/Assets/Scripts/CameraDepthSetup.cs
@@ -3,10 +3,8 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class CameraDepthSetup : MonoBehaviour
-{
-    void Start()
-    {
+public class CameraDepthSetup : MonoBehaviour {
+    void Start() {
         Camera.main.depthTextureMode = DepthTextureMode.Depth;
         // GetComponent<Camera>().depthTextureMode = DepthTextureMode.Depth;
         Camera.main.transparencySortMode = TransparencySortMode.Perspective;
diff --git a/unity/Assets/Scripts/CanOpen_Object.cs b/unity/Assets/Scripts/CanOpen_Object.cs
index 1b332c3d15..f515bec84d 100644
--- a/unity/Assets/Scripts/CanOpen_Object.cs
+++ b/unity/Assets/Scripts/CanOpen_Object.cs
@@ -4,8 +4,7 @@
 using UnityStandardAssets.Characters.FirstPerson;
 
 // Allows for openable objects to be opened.
-public class CanOpen_Object : MonoBehaviour
-{
+public class CanOpen_Object : MonoBehaviour {
     [Header("Moving Parts for this Object")]
     [SerializeField]
     public GameObject[] MovingParts;
@@ -29,8 +28,7 @@ public class CanOpen_Object : MonoBehaviour
     private float startOpenness;
     private float lastSuccessfulOpenness;
 
-    public enum failState
-    {
+    public enum failState {
         none,
         collision,
         hyperextension
@@ -62,8 +60,7 @@ public enum failState
     //public bool isCurrentlyResetting = false;
     // private bool isCurrentlyResetting = false;
 
-    public enum MovementType
-    {
+    public enum MovementType {
         Slide,
         Rotate,
         Scale
@@ -84,26 +81,22 @@ public enum MovementType
     //[SerializeField]
     // protected GameObject ClosedBoundingBox;
 
-    public List<SimObjType> WhatReceptaclesMustBeOffToOpen()
-    {
+    public List<SimObjType> WhatReceptaclesMustBeOffToOpen() {
         return MustBeOffToOpen;
     }
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
 #if UNITY_EDITOR
         if (
             !this.GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanOpen)
-        )
-        {
+        ) {
             Debug.LogError(this.name + "is missing the CanOpen Secondary Property! Please set it!");
         }
 #endif
 
-        if (!isOpen)
-        {
+        if (!isOpen) {
             currentOpenness = 0.0f;
         }
 
@@ -113,12 +106,10 @@ void Start()
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // test if it can open without Agent Command - Debug Purposes
 #if UNITY_EDITOR
-        if (Input.GetKeyDown(KeyCode.Equals))
-        {
+        if (Input.GetKeyDown(KeyCode.Equals)) {
             Interact();
         }
 #endif
@@ -126,43 +117,36 @@ void Update()
 
     // Helper functions for setting up scenes, only for use in Editor
 #if UNITY_EDITOR
-    void OnEnable()
-    {
+    void OnEnable() {
         // debug check for missing CanOpen property
         if (
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanOpen)
-        )
-        {
+        ) {
             Debug.LogError(
                 gameObject.transform.name + " is missing the Secondary Property CanOpen!"
             );
         }
     }
 
-    public void SetMovementToSlide()
-    {
+    public void SetMovementToSlide() {
         movementType = MovementType.Slide;
     }
 
-    public void SetMovementToRotate()
-    {
+    public void SetMovementToRotate() {
         movementType = MovementType.Rotate;
     }
 
-    public void SetMovementToScale()
-    {
+    public void SetMovementToScale() {
         movementType = MovementType.Scale;
     }
 #endif
 
     //sets the openness of a "rotation" based open/close object immediately without using tweening
     //specifically used for pre-scene setup
-    public void SetOpennessImmediate(float openness = 1.0f)
-    {
-        for (int i = 0; i < MovingParts.Length; i++)
-        {
+    public void SetOpennessImmediate(float openness = 1.0f) {
+        for (int i = 0; i < MovingParts.Length; i++) {
             Vector3 newRot =
                 new Vector3(openPositions[i].x, openPositions[i].y, openPositions[i].z) * openness;
             MovingParts[i].transform.localRotation = Quaternion.Euler(newRot);
@@ -179,21 +163,18 @@ public void Interact(
         bool returnToStartMode = false,
         GameObject posRotManip = null,
         GameObject posRotRef = null
-    )
-    {
+    ) {
         // if this object is pickupable AND it's trying to open (book, box, laptop, etc)
         // before trying to open or close, these objects must have kinematic = false otherwise it might clip through other objects
         SimObjPhysics sop = gameObject.GetComponent<SimObjPhysics>();
-        if (sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup && sop.isInAgentHand == false)
-        {
+        if (sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup && sop.isInAgentHand == false) {
             gameObject.GetComponent<Rigidbody>().isKinematic = false;
         }
 
         // set physicsInterval to default of 0.02 if no value has yet been given
         physicsInterval = physicsInterval.GetValueOrDefault(Time.fixedDeltaTime);
 
-        if (failure == failState.none)
-        {
+        if (failure == failState.none) {
             // storing initial opennness-state case there's a failure, and we want to revert back to it
             startOpenness = currentOpenness;
             // storing lastSuccessfulOpenness in case opening fails on very first physics-step, and returnToStart is false
@@ -201,10 +182,8 @@ public void Interact(
         }
 
         // okay let's open / reset the object!
-        if (movementType == MovementType.Slide)
-        {
-            if (failure == failState.none || returnToStart == true)
-            {
+        if (movementType == MovementType.Slide) {
+            if (failure == failState.none || returnToStart == true) {
                 StartCoroutine(
                     LerpPosition(
                         movingParts: MovingParts,
@@ -220,12 +199,9 @@ public void Interact(
                         posRotRef: posRotRef
                     )
                 );
-            }
-            else
-            {
+            } else {
                 currentOpenness = lastSuccessfulOpenness;
-                for (int i = 0; i < MovingParts.Length; i++)
-                {
+                for (int i = 0; i < MovingParts.Length; i++) {
                     MovingParts[i].transform.localPosition = Vector3.Lerp(
                         closedPositions[i],
                         openPositions[i],
@@ -237,11 +213,8 @@ public void Interact(
                 setIsOpen(currentOpenness);
                 isCurrentlyLerping = false;
             }
-        }
-        else if (movementType == MovementType.Rotate)
-        {
-            if (failure == failState.none || returnToStart == true)
-            {
+        } else if (movementType == MovementType.Rotate) {
+            if (failure == failState.none || returnToStart == true) {
                 StartCoroutine(
                     LerpRotation(
                         movingParts: MovingParts,
@@ -257,12 +230,9 @@ public void Interact(
                         posRotRef: posRotRef
                     )
                 );
-            }
-            else
-            {
+            } else {
                 currentOpenness = lastSuccessfulOpenness;
-                for (int i = 0; i < MovingParts.Length; i++)
-                {
+                for (int i = 0; i < MovingParts.Length; i++) {
                     MovingParts[i].transform.localRotation = Quaternion.Lerp(
                         Quaternion.Euler(closedPositions[i]),
                         Quaternion.Euler(openPositions[i]),
@@ -274,11 +244,8 @@ public void Interact(
                 setIsOpen(currentOpenness);
                 isCurrentlyLerping = false;
             }
-        }
-        else if (movementType == MovementType.Scale)
-        {
-            if (failure == failState.none || returnToStart == true)
-            {
+        } else if (movementType == MovementType.Scale) {
+            if (failure == failState.none || returnToStart == true) {
                 StartCoroutine(
                     LerpScale(
                         movingParts: MovingParts,
@@ -294,12 +261,9 @@ public void Interact(
                         posRotRef: posRotRef
                     )
                 );
-            }
-            else
-            {
+            } else {
                 currentOpenness = lastSuccessfulOpenness;
-                for (int i = 0; i < MovingParts.Length; i++)
-                {
+                for (int i = 0; i < MovingParts.Length; i++) {
                     MovingParts[i].transform.localScale = Vector3.Lerp(
                         closedPositions[i],
                         openPositions[i],
@@ -326,13 +290,11 @@ private protected IEnumerator LerpPosition(
         bool returnToStartMode,
         GameObject posRotManip,
         GameObject posRotRef
-    )
-    {
+    ) {
         float elapsedTime = 0f;
         while (
             elapsedTime < animationTime && (failure == failState.none || returnToStartMode == true)
-        )
-        {
+        ) {
             lastSuccessfulOpenness = currentOpenness;
             elapsedTime += physicsInterval;
             currentOpenness = Mathf.Clamp(
@@ -342,8 +304,7 @@ GameObject posRotRef
                 Mathf.Max(initialOpenness, desiredOpenness)
             );
 
-            for (int i = 0; i < movingParts.Length; i++)
-            {
+            for (int i = 0; i < movingParts.Length; i++) {
                 movingParts[i].transform.localPosition = Vector3.Lerp(
                     closedLocalPositions[i],
                     openLocalPositions[i],
@@ -351,8 +312,7 @@ GameObject posRotRef
                 );
             }
 
-            if (useGripper == true)
-            {
+            if (useGripper == true) {
                 SyncPosRot(posRotManip, posRotRef);
             }
 
@@ -379,13 +339,11 @@ private protected IEnumerator LerpRotation(
         bool returnToStartMode,
         GameObject posRotManip,
         GameObject posRotRef
-    )
-    {
+    ) {
         float elapsedTime = 0f;
         while (
             elapsedTime < animationTime && (failure == failState.none || returnToStartMode == true)
-        )
-        {
+        ) {
             lastSuccessfulOpenness = currentOpenness;
             elapsedTime += physicsInterval;
             currentOpenness = Mathf.Clamp(
@@ -395,8 +353,7 @@ GameObject posRotRef
                 Mathf.Max(initialOpenness, desiredOpenness)
             );
 
-            for (int i = 0; i < movingParts.Length; i++)
-            {
+            for (int i = 0; i < movingParts.Length; i++) {
                 movingParts[i].transform.localRotation = Quaternion.Lerp(
                     Quaternion.Euler(closedLocalRotations[i]),
                     Quaternion.Euler(openLocalRotations[i]),
@@ -404,8 +361,7 @@ GameObject posRotRef
                 );
             }
 
-            if (useGripper == true)
-            {
+            if (useGripper == true) {
                 SyncPosRot(posRotManip, posRotRef);
             }
 
@@ -432,14 +388,12 @@ private protected IEnumerator LerpScale(
         bool returnToStartMode,
         GameObject posRotManip,
         GameObject posRotRef
-    )
-    {
+    ) {
         float elapsedTime = 0f;
 
         while (
             elapsedTime < animationTime && (failure == failState.none || returnToStartMode == true)
-        )
-        {
+        ) {
             lastSuccessfulOpenness = currentOpenness;
             elapsedTime += physicsInterval;
             currentOpenness = Mathf.Clamp(
@@ -449,8 +403,7 @@ GameObject posRotRef
                 Mathf.Max(initialOpenness, desiredOpenness)
             );
 
-            for (int i = 0; i < movingParts.Length; i++)
-            {
+            for (int i = 0; i < movingParts.Length; i++) {
                 movingParts[i].transform.localScale = Vector3.Lerp(
                     closedLocalScales[i],
                     openLocalScales[i],
@@ -458,8 +411,7 @@ GameObject posRotRef
                 );
             }
 
-            if (useGripper == true)
-            {
+            if (useGripper == true) {
                 SyncPosRot(posRotManip, posRotRef);
             }
 
@@ -474,29 +426,24 @@ GameObject posRotRef
         yield break;
     }
 
-    private void setIsOpen(float openness)
-    {
+    private void setIsOpen(float openness) {
         isOpen = openness != 0;
         currentOpenness = openness;
     }
 
-    public bool GetisOpen()
-    {
+    public bool GetisOpen() {
         return isOpen;
     }
 
-    public void stepOpen(float physicsInterval, bool useGripper, float elapsedTime)
-    {
-        if (Physics.autoSimulation != true)
-        {
+    public void stepOpen(float physicsInterval, bool useGripper, float elapsedTime) {
+        if (Physics.autoSimulation != true) {
             PhysicsSceneManager.PhysicsSimulateTHOR(physicsInterval);
             Physics.SyncTransforms();
         }
 
         // failure check (The OnTriggerEnter collision check is listening at all times,
         // but this hyperextension check must be called manually)
-        if (useGripper == true && forceAction == false)
-        {
+        if (useGripper == true && forceAction == false) {
             FK_IK_Solver armBase = GameObject
                 .Find("FPSController")
                 .GetComponent<BaseAgentComponent>()
@@ -506,8 +453,7 @@ public void stepOpen(float physicsInterval, bool useGripper, float elapsedTime)
             if (
                 (armBase.IKTarget.position - armBase.armShoulder.position).magnitude + 1e-5
                 >= armBase.bone2Length + armBase.bone3Length
-            )
-            {
+            ) {
                 failure = failState.hyperextension;
 #if UNITY_EDITOR
                 Debug.Log("Agent-arm hyperextended at " + elapsedTime + ". Resetting openness.");
@@ -516,54 +462,46 @@ public void stepOpen(float physicsInterval, bool useGripper, float elapsedTime)
         }
     }
 
-    public void OnTriggerEnter(Collider other)
-    {
+    public void OnTriggerEnter(Collider other) {
         // If the openable object is meant to ignore trigger collisions entirely, then ignore
-        if (!triggerEnabled)
-        {
+        if (!triggerEnabled) {
             // Debug.Log("I'm supposed to ignore triggers!, Bye, " + other);
             return;
         }
 
         // If the openable object is not opening or closing, then ignore
-        if (!isCurrentlyLerping)
-        {
+        if (!isCurrentlyLerping) {
             // Debug.Log("I'm not currently lerping! Bye, " + other);
             return;
         }
 
         // If forceAction is enabled, then ignore
-        if (forceAction == true)
-        {
+        if (forceAction == true) {
             // Debug.Log("All checks are off when forceAction is true!");
             return;
         }
 
         // If the overlapping collider is a (non-physical) trigger collider, then ignore
-        if (other.isTrigger == true)
-        {
+        if (other.isTrigger == true) {
             // Debug.Log(other + "is a trigger, so bye!");
             return;
         }
 
         // If the overlapping collider is a child of one of the gameobjects
         // that it's been explicitly told to disregard, then ignore
-        if (IsInIgnoreArray(other, IgnoreTheseObjects))
-        {
+        if (IsInIgnoreArray(other, IgnoreTheseObjects)) {
             // Debug.Log(other + " is in ignore array");
             return;
         }
 
         // If the collider is a BoundingBox or ReceptacleTriggerBox, then ignore
-        if (other.gameObject.layer == LayerMask.NameToLayer("SimObjectInvisible"))
-        {
+        if (other.gameObject.layer == LayerMask.NameToLayer("SimObjectInvisible")) {
             // Debug.Log(other + " is bounding box or receptacle trigger box");
             return;
         }
 
         // If the overlapping collider is a descendant of the openable GameObject itself (or its parent), then ignore
-        if (hasAncestor(other.transform.gameObject, gameObject))
-        {
+        if (hasAncestor(other.transform.gameObject, gameObject)) {
             // Debug.Log(other + " belongs to me!");
             return;
         }
@@ -572,8 +510,7 @@ public void OnTriggerEnter(Collider other)
         if (
             ignoreAgentInTransition == true
             && hasAncestor(other.transform.gameObject, GameObject.Find("FPSController"))
-        )
-        {
+        ) {
             // Debug.Log(other + " belongs to agent, and ignoreAgentInTransition is active!");
             return;
         }
@@ -585,20 +522,16 @@ public void OnTriggerEnter(Collider other)
             && ancestorSimObjPhysics(other.gameObject).PrimaryProperty
                 != SimObjPrimaryProperty.Static
             && stopAtNonStaticCol == false
-        )
-        {
+        ) {
             // Debug.Log("Ignore nonstatics " + other);
             return;
         }
 
         // All right, so it was a legit collision? RESET!
         failure = failState.collision;
-        if (ancestorSimObjPhysics(other.gameObject) != null)
-        {
+        if (ancestorSimObjPhysics(other.gameObject) != null) {
             failureCollision = other.GetComponentInParent<SimObjPhysics>().gameObject;
-        }
-        else
-        {
+        } else {
             failureCollision = other.gameObject;
         }
 #if UNITY_EDITOR
@@ -608,14 +541,10 @@ public void OnTriggerEnter(Collider other)
 
     // for use in OnTriggerEnter ignore check
     // return true if it should ignore the object hit. Return false to cause this object to reset to the original position
-    public bool IsInIgnoreArray(Collider other, GameObject[] ignoredObjects)
-    {
-        foreach (GameObject ignoredObject in ignoredObjects)
-        {
-            foreach (Collider ignoredCollider in ignoredObject.GetComponentsInChildren<Collider>())
-            {
-                if (other == ignoredCollider)
-                {
+    public bool IsInIgnoreArray(Collider other, GameObject[] ignoredObjects) {
+        foreach (GameObject ignoredObject in ignoredObjects) {
+            foreach (Collider ignoredCollider in ignoredObject.GetComponentsInChildren<Collider>()) {
+                if (other == ignoredCollider) {
                     return true;
                 }
             }
@@ -623,107 +552,79 @@ public bool IsInIgnoreArray(Collider other, GameObject[] ignoredObjects)
         return false;
     }
 
-    private bool hasAncestor(GameObject child, GameObject potentialAncestor)
-    {
-        if (child == potentialAncestor)
-        {
+    private bool hasAncestor(GameObject child, GameObject potentialAncestor) {
+        if (child == potentialAncestor) {
             return true;
-        }
-        else if (child.transform.parent != null)
-        {
+        } else if (child.transform.parent != null) {
             return hasAncestor(child.transform.parent.gameObject, potentialAncestor);
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
-    private static SimObjPhysics ancestorSimObjPhysics(GameObject go)
-    {
-        if (go == null)
-        {
+    private static SimObjPhysics ancestorSimObjPhysics(GameObject go) {
+        if (go == null) {
             return null;
         }
         SimObjPhysics so = go.GetComponent<SimObjPhysics>();
-        if (so != null)
-        {
+        if (so != null) {
             return so;
-        }
-        else if (go.transform.parent != null)
-        {
+        } else if (go.transform.parent != null) {
             return ancestorSimObjPhysics(go.transform.parent.gameObject);
-        }
-        else
-        {
+        } else {
             return null;
         }
     }
 
-    public MovementType GetMovementType()
-    {
+    public MovementType GetMovementType() {
         return movementType;
     }
 
-    public float GetStartOpenness()
-    {
+    public float GetStartOpenness() {
         return startOpenness;
     }
 
-    public void SetFailState(failState failState)
-    {
+    public void SetFailState(failState failState) {
         failure = failState;
     }
 
-    public failState GetFailState()
-    {
+    public failState GetFailState() {
         return failure;
     }
 
-    public void SetFailureCollision(GameObject collision)
-    {
+    public void SetFailureCollision(GameObject collision) {
         failureCollision = collision;
     }
 
-    public GameObject GetFailureCollision()
-    {
+    public GameObject GetFailureCollision() {
         return failureCollision;
     }
 
-    public void SetForceAction(bool forceAction)
-    {
+    public void SetForceAction(bool forceAction) {
         this.forceAction = forceAction;
     }
 
-    public void SetIgnoreAgentInTransition(bool ignoreAgentInTransition)
-    {
+    public void SetIgnoreAgentInTransition(bool ignoreAgentInTransition) {
         this.ignoreAgentInTransition = ignoreAgentInTransition;
     }
 
-    public void SetStopAtNonStaticCol(bool stopAtNonStaticCol)
-    {
+    public void SetStopAtNonStaticCol(bool stopAtNonStaticCol) {
         this.stopAtNonStaticCol = stopAtNonStaticCol;
     }
 
-    public bool GetIsCurrentlyLerping()
-    {
-        if (this.isCurrentlyLerping)
-        {
+    public bool GetIsCurrentlyLerping() {
+        if (this.isCurrentlyLerping) {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
-    public void SetIsCurrentlyLerping(bool isCurrentlyLerping)
-    {
+    public void SetIsCurrentlyLerping(bool isCurrentlyLerping) {
         this.isCurrentlyLerping = isCurrentlyLerping;
     }
 
-    public void SyncPosRot(GameObject child, GameObject parent)
-    {
+    public void SyncPosRot(GameObject child, GameObject parent) {
         child.transform.position = parent.transform.position;
         child.transform.rotation = parent.transform.rotation;
     }
diff --git a/unity/Assets/Scripts/CanToggleOnOff.cs b/unity/Assets/Scripts/CanToggleOnOff.cs
index 660c9328e4..db42f092e4 100644
--- a/unity/Assets/Scripts/CanToggleOnOff.cs
+++ b/unity/Assets/Scripts/CanToggleOnOff.cs
@@ -4,8 +4,7 @@
 
 // serialized class so it can show up in Inspector Window
 [System.Serializable]
-public class SwapObjList
-{
+public class SwapObjList {
     // reference to game object that needs to have materials changed
     [Header("Object That Needs Mat Swaps")]
     [SerializeField]
@@ -22,8 +21,7 @@ public class SwapObjList
     public Material[] OffMaterials;
 }
 
-public class CanToggleOnOff : MonoBehaviour
-{
+public class CanToggleOnOff : MonoBehaviour {
     // the array of moving parts and lightsources will correspond with each other based on their
     // position in the array
 
@@ -66,8 +64,7 @@ public class CanToggleOnOff : MonoBehaviour
 
     private bool isCurrentlyLerping = false;
 
-    protected enum MovementType
-    {
+    protected enum MovementType {
         Slide,
         Rotate
     };
@@ -95,51 +92,43 @@ protected enum MovementType
     // another sim object, the stove knob.
     // stove knob: returns toggleable, returns istoggled
     // stove burner: only returns istoggled
-    public bool ReturnSelfControlled()
-    {
+    public bool ReturnSelfControlled() {
         return SelfControlled;
     }
 
     // returns references to all sim objects this object toggles the on/off state of. For example all stove knobs can
     // return which burner they control with this
-    public SimObjPhysics[] ReturnControlledSimObjects()
-    {
+    public SimObjPhysics[] ReturnControlledSimObjects() {
         return ControlledSimObjects;
     }
 
-    public List<SimObjType> ReturnMustBeClosedToTurnOn()
-    {
+    public List<SimObjType> ReturnMustBeClosedToTurnOn() {
         return MustBeClosedToTurnOn;
     }
 
-    public bool isTurnedOnOrOff()
-    {
+    public bool isTurnedOnOrOff() {
         return isOn;
     }
     // Helper functions for setting up scenes, only for use in Editor
 #if UNITY_EDITOR
-    public void SetMovementToSlide()
-    {
+    public void SetMovementToSlide() {
         movementType = MovementType.Slide;
     }
 
-    public void SetMovementToRotate()
-    {
+    public void SetMovementToRotate() {
         movementType = MovementType.Rotate;
     }
 #endif
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         //setLightSourcesNames();
 
 #if UNITY_EDITOR
         if (
             !this.GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanToggleOnOff)
-        )
-        {
+        ) {
             Debug.LogError(
                 this.name + "is missing the CanToggleOnOff Secondary Property! Please set it!"
             );
@@ -158,36 +147,28 @@ void Start()
     // }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // // test if it can open without Agent Command - Debug Purposes
 #if UNITY_EDITOR
-        if (Input.GetKeyDown(KeyCode.Minus))
-        {
+        if (Input.GetKeyDown(KeyCode.Minus)) {
             Toggle();
         }
 #endif
     }
 
-    public void Toggle()
-    {
+    public void Toggle() {
         // if this object is controlled by another object, do nothing and report failure?
-        if (!SelfControlled)
-        {
+        if (!SelfControlled) {
             return;
         }
 
         isCurrentlyLerping = true;
         // check if there are moving parts
         // check if there are lights/materials etc to swap out
-        if (!isOn)
-        {
-            if (MovingParts.Length > 0)
-            {
-                for (int i = 0; i < MovingParts.Length; i++)
-                {
-                    if (movementType == MovementType.Slide)
-                    {
+        if (!isOn) {
+            if (MovingParts.Length > 0) {
+                for (int i = 0; i < MovingParts.Length; i++) {
+                    if (movementType == MovementType.Slide) {
                         StartCoroutine(
                             LerpPosition(
                                 movingParts: MovingParts,
@@ -198,9 +179,7 @@ public void Toggle()
                                 animationTime: animationTime
                             )
                         );
-                    }
-                    else if (movementType == MovementType.Rotate)
-                    {
+                    } else if (movementType == MovementType.Rotate) {
                         StartCoroutine(
                             LerpRotation(
                                 movingParts: MovingParts,
@@ -216,15 +195,10 @@ public void Toggle()
             }
 
             setisOn();
-        }
-        else
-        {
-            if (MovingParts.Length > 0)
-            {
-                for (int i = 0; i < MovingParts.Length; i++)
-                {
-                    if (movementType == MovementType.Slide)
-                    {
+        } else {
+            if (MovingParts.Length > 0) {
+                for (int i = 0; i < MovingParts.Length; i++) {
+                    if (movementType == MovementType.Slide) {
                         StartCoroutine(
                             LerpPosition(
                                 movingParts: MovingParts,
@@ -235,9 +209,7 @@ public void Toggle()
                                 animationTime: animationTime
                             )
                         );
-                    }
-                    else if (movementType == MovementType.Rotate)
-                    {
+                    } else if (movementType == MovementType.Rotate) {
                         StartCoroutine(
                             LerpRotation(
                                 movingParts: MovingParts,
@@ -258,41 +230,31 @@ public void Toggle()
     }
 
     // toggle isOn variable, swap Materials and enable/disable Light sources
-    private void setisOn()
-    {
+    private void setisOn() {
         // if isOn true, set it to false and also turn off all lights/deactivate materials
-        if (isOn)
-        {
-            if (LightSources.Length > 0)
-            {
-                for (int i = 0; i < LightSources.Length; i++)
-                {
+        if (isOn) {
+            if (LightSources.Length > 0) {
+                for (int i = 0; i < LightSources.Length; i++) {
                     LightSources[i].transform.gameObject.SetActive(false);
                 }
             }
 
-            if (effects.Length > 0)
-            {
-                for (int i = 0; i < effects.Length; i++)
-                {
+            if (effects.Length > 0) {
+                for (int i = 0; i < effects.Length; i++) {
                     effects[i].SetActive(false);
                 }
             }
 
-            if (MaterialSwapObjects.Length > 0)
-            {
-                for (int i = 0; i < MaterialSwapObjects.Length; i++)
-                {
+            if (MaterialSwapObjects.Length > 0) {
+                for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                     MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                         MaterialSwapObjects[i].OffMaterials;
                 }
             }
 
             // also set any objects this object controlls to the off state
-            if (ControlledSimObjects.Length > 0)
-            {
-                foreach (SimObjPhysics sop in ControlledSimObjects)
-                {
+            if (ControlledSimObjects.Length > 0) {
+                foreach (SimObjPhysics sop in ControlledSimObjects) {
                     sop.GetComponent<CanToggleOnOff>().isOn = false;
                 }
             }
@@ -300,38 +262,29 @@ private void setisOn()
             isOn = false;
         }
         // if isOn false, set to true and then turn ON all lights and activate material swaps
-        else
-        {
-            if (LightSources.Length > 0)
-            {
-                for (int i = 0; i < LightSources.Length; i++)
-                {
+        else {
+            if (LightSources.Length > 0) {
+                for (int i = 0; i < LightSources.Length; i++) {
                     LightSources[i].transform.gameObject.SetActive(true);
                 }
             }
 
-            if (effects.Length > 0)
-            {
-                for (int i = 0; i < effects.Length; i++)
-                {
+            if (effects.Length > 0) {
+                for (int i = 0; i < effects.Length; i++) {
                     effects[i].SetActive(true);
                 }
             }
 
-            if (MaterialSwapObjects.Length > 0)
-            {
-                for (int i = 0; i < MaterialSwapObjects.Length; i++)
-                {
+            if (MaterialSwapObjects.Length > 0) {
+                for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                     MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                         MaterialSwapObjects[i].OnMaterials;
                 }
             }
 
             // also set any objects this object controlls to the on state
-            if (ControlledSimObjects.Length > 0)
-            {
-                foreach (SimObjPhysics sop in ControlledSimObjects)
-                {
+            if (ControlledSimObjects.Length > 0) {
+                foreach (SimObjPhysics sop in ControlledSimObjects) {
                     sop.GetComponent<CanToggleOnOff>().isOn = true;
                 }
             }
@@ -347,11 +300,9 @@ private protected IEnumerator LerpPosition(
         float initialOpenness,
         float desiredOpenness,
         float animationTime
-    )
-    {
+    ) {
         float elapsedTime = 0f;
-        while (elapsedTime < animationTime)
-        {
+        while (elapsedTime < animationTime) {
             elapsedTime += Time.fixedDeltaTime;
             float currentOpenness = Mathf.Clamp(
                 initialOpenness
@@ -359,8 +310,7 @@ float animationTime
                 Mathf.Min(initialOpenness, desiredOpenness),
                 Mathf.Max(initialOpenness, desiredOpenness)
             );
-            for (int i = 0; i < movingParts.Length; i++)
-            {
+            for (int i = 0; i < movingParts.Length; i++) {
                 movingParts[i].transform.localPosition = Vector3.Lerp(
                     offLocalPositions[i],
                     onLocalPositions[i],
@@ -378,11 +328,9 @@ private protected IEnumerator LerpRotation(
         float initialOpenness,
         float desiredOpenness,
         float animationTime
-    )
-    {
+    ) {
         float elapsedTime = 0f;
-        while (elapsedTime < animationTime)
-        {
+        while (elapsedTime < animationTime) {
             elapsedTime += Time.fixedDeltaTime;
             float currentOpenness = Mathf.Clamp(
                 initialOpenness
@@ -390,8 +338,7 @@ float animationTime
                 Mathf.Min(initialOpenness, desiredOpenness),
                 Mathf.Max(initialOpenness, desiredOpenness)
             );
-            for (int i = 0; i < MovingParts.Length; i++)
-            {
+            for (int i = 0; i < MovingParts.Length; i++) {
                 MovingParts[i].transform.localRotation = Quaternion.Lerp(
                     Quaternion.Euler(offLocalRotations[i]),
                     Quaternion.Euler(onLocalRotations[i]),
@@ -402,14 +349,10 @@ float animationTime
         yield break;
     }
 
-    public bool GetIsCurrentlyLerping()
-    {
-        if (this.isCurrentlyLerping)
-        {
+    public bool GetIsCurrentlyLerping() {
+        if (this.isCurrentlyLerping) {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
diff --git a/unity/Assets/Scripts/ChangeLighting.cs b/unity/Assets/Scripts/ChangeLighting.cs
index bdac9b774b..da85e4c7ad 100644
--- a/unity/Assets/Scripts/ChangeLighting.cs
+++ b/unity/Assets/Scripts/ChangeLighting.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ChangeLighting : MonoBehaviour
-{
+public class ChangeLighting : MonoBehaviour {
     // 9 elements right now
     public GameObject[] Lights;
 
@@ -13,10 +12,8 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    public void SetLights(int lightset)
-    {
-        foreach (GameObject go in Lights)
-        {
+    public void SetLights(int lightset) {
+        foreach (GameObject go in Lights) {
             go.SetActive(false);
         }
 
diff --git a/unity/Assets/Scripts/ColdZone.cs b/unity/Assets/Scripts/ColdZone.cs
index 59e07f4bfb..a432165da0 100644
--- a/unity/Assets/Scripts/ColdZone.cs
+++ b/unity/Assets/Scripts/ColdZone.cs
@@ -2,24 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ColdZone : MonoBehaviour
-{
+public class ColdZone : MonoBehaviour {
     // Start is called before the first frame update
     void Start() { }
 
     // Update is called once per frame
     void Update() { }
 
-    public void OnTriggerStay(Collider other)
-    {
+    public void OnTriggerStay(Collider other) {
         // if any simobjphys are touching this zone, set their temperature values to Cold
-        if (other.GetComponentInParent<SimObjPhysics>())
-        {
+        if (other.GetComponentInParent<SimObjPhysics>()) {
             SimObjPhysics sop = other.GetComponentInParent<SimObjPhysics>();
             sop.CurrentTemperature = Temperature.Cold;
 
-            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue())
-            {
+            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue()) {
                 sop.HowManySecondsUntilRoomTemp = sop.GetTimerResetValue();
             }
 
diff --git a/unity/Assets/Scripts/CollisionEventResolver.cs b/unity/Assets/Scripts/CollisionEventResolver.cs
index febc7fa215..6debb01d8f 100644
--- a/unity/Assets/Scripts/CollisionEventResolver.cs
+++ b/unity/Assets/Scripts/CollisionEventResolver.cs
@@ -2,13 +2,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public abstract class CollisionEventResolver : MonoBehaviour
-{
-    protected void Start()
-    {
+public abstract class CollisionEventResolver : MonoBehaviour {
+    protected void Start() {
         var listener = this.transform.GetComponentInParent<CollisionListener>();
-        if (listener != null)
-        {
+        if (listener != null) {
             listener.setCollisionEventResolver(this);
         }
     }
@@ -20,28 +17,21 @@ HashSet<Collider> internalColliders
 }
 
 // Class to track what was hit while arm was moving
-public class StaticCollision
-{
+public class StaticCollision {
     public GameObject gameObject;
 
     public SimObjPhysics simObjPhysics;
 
     // indicates if gameObject a simObject
-    public bool isSimObj
-    {
+    public bool isSimObj {
         get { return simObjPhysics != null; }
     }
 
-    public string name
-    {
-        get
-        {
-            if (this.isSimObj)
-            {
+    public string name {
+        get {
+            if (this.isSimObj) {
                 return this.simObjPhysics.name;
-            }
-            else
-            {
+            } else {
                 return this.gameObject.name;
             }
         }
diff --git a/unity/Assets/Scripts/CollisionListener.cs b/unity/Assets/Scripts/CollisionListener.cs
index 400d4d43b4..ba544a72c6 100644
--- a/unity/Assets/Scripts/CollisionListener.cs
+++ b/unity/Assets/Scripts/CollisionListener.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class CollisionListener : MonoBehaviour
-{
+public class CollisionListener : MonoBehaviour {
     public Dictionary<Collider, HashSet<Collider>> externalColliderToInternalCollisions =
         new Dictionary<Collider, HashSet<Collider>>();
     public List<GameObject> doNotRegisterChildrenWithin = new List<GameObject>();
@@ -19,13 +18,10 @@ public class CollisionListener : MonoBehaviour
     private HashSet<CollisionListenerChild> collisionListenerChildren =
         new HashSet<CollisionListenerChild>();
 
-    void Start()
-    {
+    void Start() {
         registerAllChildColliders();
-        foreach (CollisionListener cl in this.GetComponentsInChildren<CollisionListener>())
-        {
-            if (cl.gameObject != this.gameObject)
-            {
+        foreach (CollisionListener cl in this.GetComponentsInChildren<CollisionListener>()) {
+            if (cl.gameObject != this.gameObject) {
 #if UNITY_EDITOR
                 Debug.Log(
                     $"Offending CollisionListener: {cl.gameObject} a descendent of {this.gameObject}"
@@ -38,94 +34,74 @@ void Start()
         }
     }
 
-    public void setCollisionEventResolver(CollisionEventResolver collisionEventResolver)
-    {
+    public void setCollisionEventResolver(CollisionEventResolver collisionEventResolver) {
         this.collisionEventResolver = collisionEventResolver;
     }
 
-    public void registerAllChildColliders()
-    {
+    public void registerAllChildColliders() {
         HashSet<Collider> ignoredColliders = new HashSet<Collider>();
-        foreach (GameObject go in doNotRegisterChildrenWithin)
-        {
-            foreach (Collider c in go.GetComponentsInChildren<Collider>())
-            {
+        foreach (GameObject go in doNotRegisterChildrenWithin) {
+            foreach (Collider c in go.GetComponentsInChildren<Collider>()) {
                 ignoredColliders.Add(c);
             }
         }
 
-        foreach (CollisionListenerChild clc in collisionListenerChildren)
-        {
+        foreach (CollisionListenerChild clc in collisionListenerChildren) {
             clc.parent = null;
         }
         collisionListenerChildren.Clear();
 
-        foreach (Collider c in this.GetComponentsInChildren<Collider>())
-        {
-            if (!ignoredColliders.Contains(c))
-            {
+        foreach (Collider c in this.GetComponentsInChildren<Collider>()) {
+            if (!ignoredColliders.Contains(c)) {
                 registerChild(c);
             }
         }
     }
 
-    public void registerChild(Collider c)
-    {
-        if (c.enabled && c.isTrigger)
-        {
+    public void registerChild(Collider c) {
+        if (c.enabled && c.isTrigger) {
             CollisionListenerChild clc = c.gameObject.GetComponent<CollisionListenerChild>();
-            if (clc == null)
-            {
+            if (clc == null) {
                 clc = c.gameObject.AddComponent<CollisionListenerChild>();
             }
             registerChild(clc);
         }
     }
 
-    public void registerChild(CollisionListenerChild clc)
-    {
+    public void registerChild(CollisionListenerChild clc) {
         clc.parent = this;
         collisionListenerChildren.Add(clc);
     }
 
-    public void deregisterChild(Collider c)
-    {
+    public void deregisterChild(Collider c) {
         deregisterChild(c.gameObject.GetComponent<CollisionListenerChild>());
     }
 
-    public void deregisterChild(CollisionListenerChild clc)
-    {
-        if (clc != null)
-        {
+    public void deregisterChild(CollisionListenerChild clc) {
+        if (clc != null) {
             clc.parent = null;
             collisionListenerChildren.Remove(clc);
         }
     }
 
-    public void RegisterCollision(Collider internalCollider, Collider externalCollider)
-    {
-        if (!externalColliderToInternalCollisions.ContainsKey(externalCollider))
-        {
+    public void RegisterCollision(Collider internalCollider, Collider externalCollider) {
+        if (!externalColliderToInternalCollisions.ContainsKey(externalCollider)) {
             externalColliderToInternalCollisions[externalCollider] = new HashSet<Collider>();
         }
         externalColliderToInternalCollisions[externalCollider].Add(internalCollider);
     }
 
-    public void DeregisterCollision(Collider internalCollider, Collider externalCollider)
-    {
-        if (externalColliderToInternalCollisions.ContainsKey(externalCollider))
-        {
+    public void DeregisterCollision(Collider internalCollider, Collider externalCollider) {
+        if (externalColliderToInternalCollisions.ContainsKey(externalCollider)) {
             externalColliderToInternalCollisions[externalCollider].Remove(internalCollider);
 
-            if (externalColliderToInternalCollisions[externalCollider].Count == 0)
-            {
+            if (externalColliderToInternalCollisions[externalCollider].Count == 0) {
                 externalColliderToInternalCollisions.Remove(externalCollider);
             }
         }
     }
 
-    public void Reset()
-    {
+    public void Reset() {
         externalColliderToInternalCollisions.Clear();
         deadZoneCheck = false;
     }
@@ -133,8 +109,7 @@ public void Reset()
     private static bool debugCheckIfCollisionIsNonTrivial(
         Collider internalCollider,
         Collider externalCollider
-    )
-    {
+    ) {
         Vector3 direction;
         float distance = 0f;
         Physics.ComputePenetration(
@@ -154,46 +129,35 @@ out distance
         return distance > 0.001f;
     }
 
-    private StaticCollision ColliderToStaticCollision(Collider collider)
-    {
+    private StaticCollision ColliderToStaticCollision(Collider collider) {
         StaticCollision sc = null;
-        if (!collider.isTrigger)
-        { // only detect collisions with non-trigger colliders detected
-            if (collider.GetComponentInParent<SimObjPhysics>())
-            {
+        if (!collider.isTrigger) { // only detect collisions with non-trigger colliders detected
+            if (collider.GetComponentInParent<SimObjPhysics>()) {
                 // how does this handle nested sim objects? maybe it's fine?
                 SimObjPhysics sop = collider.GetComponentInParent<SimObjPhysics>();
                 if (
                     sop.PrimaryProperty == SimObjPrimaryProperty.Static
                     || sop.GetComponent<Rigidbody>().isKinematic == true
-                )
-                {
+                ) {
                     // #if UNITY_EDITOR
                     // Debug.Log("Collided with static sim obj " + sop.name);
                     // #endif
                     sc = new StaticCollision();
                     sc.simObjPhysics = sop;
                     sc.gameObject = collider.gameObject;
-                }
-                else if (useMassThreshold)
-                {
+                } else if (useMassThreshold) {
                     // if a moveable or pickupable object is too heavy for the arm to move
                     // flag it as a static collision so the arm will stop
-                    if (sop.Mass > massThreshold)
-                    {
+                    if (sop.Mass > massThreshold) {
                         sc = new StaticCollision();
                         sc.simObjPhysics = sop;
                         sc.gameObject = collider.gameObject;
                     }
                 }
-            }
-            else if (collider.gameObject.CompareTag("Structure"))
-            {
+            } else if (collider.gameObject.CompareTag("Structure")) {
                 sc = new StaticCollision();
                 sc.gameObject = collider.gameObject;
-            }
-            else if (collisionEventResolver != null)
-            {
+            } else if (collisionEventResolver != null) {
                 sc = collisionEventResolver.resolveToStaticCollision(
                     collider,
                     externalColliderToInternalCollisions[collider]
@@ -203,33 +167,26 @@ private StaticCollision ColliderToStaticCollision(Collider collider)
         return sc;
     }
 
-    public IEnumerable<StaticCollision> StaticCollisions(IEnumerable<Collider> colliders)
-    {
-        foreach (Collider c in colliders)
-        {
+    public IEnumerable<StaticCollision> StaticCollisions(IEnumerable<Collider> colliders) {
+        foreach (Collider c in colliders) {
             var staticCollision = ColliderToStaticCollision(collider: c);
-            if (staticCollision != null)
-            {
+            if (staticCollision != null) {
                 yield return staticCollision;
             }
         }
     }
 
-    public IEnumerable<StaticCollision> StaticCollisions()
-    {
+    public IEnumerable<StaticCollision> StaticCollisions() {
         return StaticCollisions(this.externalColliderToInternalCollisions.Keys);
     }
 
-    public void enableDeadZoneCheck()
-    {
+    public void enableDeadZoneCheck() {
         deadZoneCheck = true;
     }
 
-    public bool TransformChecks(PhysicsRemoteFPSAgentController controller, Transform objectTarget)
-    {
+    public bool TransformChecks(PhysicsRemoteFPSAgentController controller, Transform objectTarget) {
         // this action is specifically for a stretch wrist-rotation with limits
-        if (deadZoneCheck)
-        {
+        if (deadZoneCheck) {
             float currentYaw = objectTarget.rotation.eulerAngles.y;
             float cLimit = controller
                 .gameObject.GetComponentInChildren<Stretch_Robot_Arm_Controller>()
@@ -240,32 +197,24 @@ public bool TransformChecks(PhysicsRemoteFPSAgentController controller, Transfor
 
             // Consolidate reachable euler-rotations (which are normally bounded by [0, 360)) into a continuous number line,
             // bounded instead by [continuousCounterClockwiseLocalRotationLimit, continuousClockwiseLocalRotationLimit + 360)
-            if (cLimit < ccLimit)
-            {
+            if (cLimit < ccLimit) {
                 cLimit += 360;
-                if (currentYaw < ccLimit)
-                {
+                if (currentYaw < ccLimit) {
                     currentYaw += 360;
                 }
             }
 
-            if (currentYaw < ccLimit || currentYaw > cLimit)
-            {
+            if (currentYaw < ccLimit || currentYaw > cLimit) {
                 return true;
-            }
-            else
-            {
+            } else {
                 return false;
             }
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
-    public virtual bool ShouldHalt()
-    {
+    public virtual bool ShouldHalt() {
         return StaticCollisions().GetEnumerator().MoveNext();
     }
 }
diff --git a/unity/Assets/Scripts/CollisionListenerAB.cs b/unity/Assets/Scripts/CollisionListenerAB.cs
index 350878f512..b521bf4c50 100644
--- a/unity/Assets/Scripts/CollisionListenerAB.cs
+++ b/unity/Assets/Scripts/CollisionListenerAB.cs
@@ -1,9 +1,7 @@
-public class CollisionListenerAB : CollisionListener
-{
+public class CollisionListenerAB : CollisionListener {
     // public ArticulatedArmController armController;
 
-    public override bool ShouldHalt()
-    {
+    public override bool ShouldHalt() {
         // TODO: Implement halting condition, you can use armController.GetArmTarget() , and othe properties
         return false;
     }
diff --git a/unity/Assets/Scripts/CollisionListenerChild.cs b/unity/Assets/Scripts/CollisionListenerChild.cs
index dea2885a12..236906846e 100644
--- a/unity/Assets/Scripts/CollisionListenerChild.cs
+++ b/unity/Assets/Scripts/CollisionListenerChild.cs
@@ -3,41 +3,32 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class CollisionListenerChild : MonoBehaviour
-{
+public class CollisionListenerChild : MonoBehaviour {
     // references to the joints of the mid level arm
 
     public CollisionListener parent;
     public Collider us;
 
-    public void Start()
-    {
+    public void Start() {
         us = this.gameObject.GetComponent<Collider>();
     }
 
-    public void OnDestroy()
-    {
-        if (parent != null)
-        {
+    public void OnDestroy() {
+        if (parent != null) {
             parent.deregisterChild(this.GetComponent<Collider>());
         }
     }
 
-    public void OnTriggerExit(Collider col)
-    {
-        if (parent)
-        {
+    public void OnTriggerExit(Collider col) {
+        if (parent) {
             parent.DeregisterCollision(this.us, col);
         }
     }
 
-    public void OnTriggerStay(Collider col)
-    {
+    public void OnTriggerStay(Collider col) {
 #if UNITY_EDITOR
-        if (!parent.externalColliderToInternalCollisions.ContainsKey(col))
-        {
-            if (col.gameObject.name == "StandardIslandHeight" || col.gameObject.name == "Sphere")
-            {
+        if (!parent.externalColliderToInternalCollisions.ContainsKey(col)) {
+            if (col.gameObject.name == "StandardIslandHeight" || col.gameObject.name == "Sphere") {
                 Debug.Log(
                     "got collision stay with "
                         + col.gameObject.name
@@ -47,19 +38,15 @@ public void OnTriggerStay(Collider col)
             }
         }
 #endif
-        if (parent)
-        {
+        if (parent) {
             parent.RegisterCollision(this.us, col);
         }
     }
 
-    public void OnTriggerEnter(Collider col)
-    {
+    public void OnTriggerEnter(Collider col) {
 #if UNITY_EDITOR
-        if (!parent.externalColliderToInternalCollisions.ContainsKey(col))
-        {
-            if (col.gameObject.name == "StandardIslandHeight" || col.gameObject.name == "Sphere")
-            {
+        if (!parent.externalColliderToInternalCollisions.ContainsKey(col)) {
+            if (col.gameObject.name == "StandardIslandHeight" || col.gameObject.name == "Sphere") {
                 Debug.Log(
                     "got collision enter with "
                         + col.gameObject.name
@@ -70,8 +57,7 @@ public void OnTriggerEnter(Collider col)
         }
 #endif
         // Debug.Log("got collision with " + col.gameObject.name + " this" + this.gameObject.name);
-        if (parent)
-        {
+        if (parent) {
             parent.RegisterCollision(this.us, col);
         }
     }
diff --git a/unity/Assets/Scripts/ColorChanger.cs b/unity/Assets/Scripts/ColorChanger.cs
index 111d0ddec2..7ea2e4e137 100644
--- a/unity/Assets/Scripts/ColorChanger.cs
+++ b/unity/Assets/Scripts/ColorChanger.cs
@@ -2,8 +2,7 @@
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-public class ColorChanger : MonoBehaviour
-{
+public class ColorChanger : MonoBehaviour {
     // These will eventually be turned into sets, such that they are
     // easily checkable at runtime.
 
@@ -12,8 +11,7 @@ public class ColorChanger : MonoBehaviour
     Dictionary<string, HashSet<string>> materialGroupPaths;
     private ResourceAssetManager assetManager;
 
-    protected void cacheMaterials()
-    {
+    protected void cacheMaterials() {
         var objectMaterialLabels = new string[]
         {
             "AlarmClockMaterials",
@@ -84,21 +82,18 @@ protected void cacheMaterials()
         this.assetManager = new ResourceAssetManager();
 
         objectMaterials = new Dictionary<string, List<ResourceAssetReference<Material>>>();
-        foreach (var label in objectMaterialLabels)
-        {
+        foreach (var label in objectMaterialLabels) {
             objectMaterials[label] = this.assetManager.FindResourceAssetReferences<Material>(label);
         }
 
         materialGroupPaths = new Dictionary<string, HashSet<string>>();
-        foreach (var label in materialGroupLabels)
-        {
+        foreach (var label in materialGroupLabels) {
             HashSet<string> paths = new HashSet<string>();
             foreach (
                 var resourceAssetRef in this.assetManager.FindResourceAssetReferences<Material>(
                     label
                 )
-            )
-            {
+            ) {
                 paths.Add(resourceAssetRef.ResourcePath);
             }
 
@@ -106,28 +101,23 @@ var resourceAssetRef in this.assetManager.FindResourceAssetReferences<Material>(
         }
     }
 
-    private void storeOriginal(Material mat)
-    {
-        if (!origMaterials.ContainsKey(mat))
-        {
+    private void storeOriginal(Material mat) {
+        if (!origMaterials.ContainsKey(mat)) {
             origMaterials[mat] = new Material(mat);
         }
     }
 
-    private void swapMaterial(Material mat1, Material mat2)
-    {
+    private void swapMaterial(Material mat1, Material mat2) {
         storeOriginal(mat1);
         storeOriginal(mat2);
 
-        if (mat1.HasProperty("_MainTex") && mat2.HasProperty("_MainTex"))
-        {
+        if (mat1.HasProperty("_MainTex") && mat2.HasProperty("_MainTex")) {
             Texture tempTexture = mat1.mainTexture;
             mat1.mainTexture = mat2.mainTexture;
             mat2.mainTexture = tempTexture;
         }
 
-        if (mat1.HasProperty("_Color") && mat2.HasProperty("_Color"))
-        {
+        if (mat1.HasProperty("_Color") && mat2.HasProperty("_Color")) {
             Color tempColor = mat1.color;
             mat1.color = mat2.color;
             mat2.color = tempColor;
@@ -137,20 +127,15 @@ private void swapMaterial(Material mat1, Material mat2)
     private void shuffleMaterials(
         HashSet<string> activeMaterialNames,
         List<ResourceAssetReference<Material>> materialGroup
-    )
-    {
-        for (int n = materialGroup.Count - 1; n >= 0; n--)
-        {
+    ) {
+        for (int n = materialGroup.Count - 1; n >= 0; n--) {
             int i = Random.Range(0, n + 1);
 
             ResourceAssetReference<Material> refA = materialGroup[n];
             ResourceAssetReference<Material> refB = materialGroup[i];
-            if (activeMaterialNames.Contains(refA.Name) || activeMaterialNames.Contains(refB.Name))
-            {
+            if (activeMaterialNames.Contains(refA.Name) || activeMaterialNames.Contains(refB.Name)) {
                 swapMaterial(refA.Load(), refB.Load());
-            }
-            else
-            {
+            } else {
                 // just swap the references if neither material is actively being used in the scene
                 materialGroup[n] = refB;
                 materialGroup[i] = refA;
@@ -165,20 +150,16 @@ public int RandomizeMaterials(
         bool useExternalMaterials,
         HashSet<string> inRoomTypes,
         HashSet<string> excludedMaterialNames = null
-    )
-    {
-        if (objectMaterials == null)
-        {
+    ) {
+        if (objectMaterials == null) {
             cacheMaterials();
         }
 
-        if (excludedMaterialNames == null)
-        {
+        if (excludedMaterialNames == null) {
             excludedMaterialNames = new HashSet<string>();
         }
 
-        Dictionary<string, string> roomTypeLabelMap = new Dictionary<string, string>()
-        {
+        Dictionary<string, string> roomTypeLabelMap = new Dictionary<string, string>() {
             ["kitchen"] = "RawKitchenMaterials",
             ["livingroom"] = "RawLivingRoomMaterials",
             ["bedroom"] = "RawBedroomMaterials",
@@ -193,12 +174,9 @@ public int RandomizeMaterials(
         // need to get loaded and shuffled, using this the shuffle step
         // can limit what materials actually get loaded through Resources.Load()
         HashSet<string> activeMaterialNames = new HashSet<string>();
-        foreach (var renderer in GameObject.FindObjectsOfType<Renderer>())
-        {
-            foreach (var mat in renderer.sharedMaterials)
-            {
-                if (mat != null && mat.name != null && !excludedMaterialNames.Contains(mat.name))
-                {
+        foreach (var renderer in GameObject.FindObjectsOfType<Renderer>()) {
+            foreach (var mat in renderer.sharedMaterials) {
+                if (mat != null && mat.name != null && !excludedMaterialNames.Contains(mat.name)) {
 #if UNITY_EDITOR
                     Debug.Log("Found material: " + mat.name);
 #endif
@@ -212,12 +190,10 @@ public int RandomizeMaterials(
                 string,
                 List<ResourceAssetReference<Material>>
             > materialGroup in objectMaterials
-        )
-        {
+        ) {
             List<ResourceAssetReference<Material>> validMaterials =
                 new List<ResourceAssetReference<Material>>();
-            foreach (ResourceAssetReference<Material> resourceAssetReference in materialGroup.Value)
-            {
+            foreach (ResourceAssetReference<Material> resourceAssetReference in materialGroup.Value) {
                 if (
                     useTrainMaterials
                         && materialGroupPaths["RawTrainMaterials"]
@@ -228,23 +204,17 @@ public int RandomizeMaterials(
                     || useTestMaterials
                         && materialGroupPaths["RawTestMaterials"]
                             .Contains(resourceAssetReference.ResourcePath)
-                )
-                {
-                    if (inRoomTypes == null)
-                    {
+                ) {
+                    if (inRoomTypes == null) {
                         validMaterials.Add(resourceAssetReference);
                         numTotalMaterials++;
-                    }
-                    else
-                    {
-                        foreach (string roomType in inRoomTypes)
-                        {
+                    } else {
+                        foreach (string roomType in inRoomTypes) {
                             string roomLabel = roomTypeLabelMap[roomType];
                             if (
                                 materialGroupPaths[roomLabel]
                                     .Contains(resourceAssetReference.ResourcePath)
-                            )
-                            {
+                            ) {
                                 validMaterials.Add(resourceAssetReference);
                                 numTotalMaterials++;
                                 break;
@@ -260,69 +230,53 @@ public int RandomizeMaterials(
         return numTotalMaterials;
     }
 
-    public void ResetMaterials()
-    {
-        foreach (KeyValuePair<Material, Material> matPair in origMaterials)
-        {
+    public void ResetMaterials() {
+        foreach (KeyValuePair<Material, Material> matPair in origMaterials) {
             Material mat = matPair.Key;
-            if (mat.HasProperty("_Color"))
-            {
+            if (mat.HasProperty("_Color")) {
                 mat.color = matPair.Value.color;
             }
-            if (mat.HasProperty("_MainTex"))
-            {
+            if (mat.HasProperty("_MainTex")) {
                 mat.mainTexture = matPair.Value.mainTexture;
             }
         }
     }
 
-    public void RandomizeColor()
-    {
-        if (objectMaterials == null)
-        {
+    public void RandomizeColor() {
+        if (objectMaterials == null) {
             cacheMaterials();
         }
 
-        foreach (var renderer in GameObject.FindObjectsOfType<Renderer>())
-        {
-            foreach (var mat in renderer.sharedMaterials)
-            {
+        foreach (var renderer in GameObject.FindObjectsOfType<Renderer>()) {
+            foreach (var mat in renderer.sharedMaterials) {
                 storeOriginal(mat);
-                if (mat.HasProperty("_Color"))
-                {
+                if (mat.HasProperty("_Color")) {
                     mat.color = Random.ColorHSV(0f, 1f, 0.5f, 1f, 0.5f, 1f);
                 }
             }
         }
     }
 
-    public void ResetColors()
-    {
-        foreach (KeyValuePair<Material, Material> matPair in origMaterials)
-        {
+    public void ResetColors() {
+        foreach (KeyValuePair<Material, Material> matPair in origMaterials) {
             Material mat = matPair.Key;
-            if (mat.HasProperty("_Color"))
-            {
+            if (mat.HasProperty("_Color")) {
                 mat.color = matPair.Value.color;
             }
         }
     }
 
-    public Dictionary<string, string[]> GetMaterials()
-    {
+    public Dictionary<string, string[]> GetMaterials() {
         Dictionary<string, string[]> orSomething = new Dictionary<string, string[]>();
 
-        if (objectMaterials == null)
-        {
+        if (objectMaterials == null) {
             cacheMaterials();
         }
 
-        foreach (KeyValuePair<string, List<ResourceAssetReference<Material>>> sm in objectMaterials)
-        {
+        foreach (KeyValuePair<string, List<ResourceAssetReference<Material>>> sm in objectMaterials) {
             List<string> materialNames = new List<string>();
 
-            foreach (ResourceAssetReference<Material> resourceAssetReference in sm.Value)
-            {
+            foreach (ResourceAssetReference<Material> resourceAssetReference in sm.Value) {
                 materialNames.Add(resourceAssetReference.Name);
             }
 
diff --git a/unity/Assets/Scripts/ConnectionProperties.cs b/unity/Assets/Scripts/ConnectionProperties.cs
index 87e21588f7..f73a0de346 100644
--- a/unity/Assets/Scripts/ConnectionProperties.cs
+++ b/unity/Assets/Scripts/ConnectionProperties.cs
@@ -3,16 +3,14 @@
 using EasyButtons;
 using UnityEngine;
 
-public enum ConnectionType
-{
+public enum ConnectionType {
     Unknown = 0,
     DoubleDoor,
     SignleDoor,
     Window
 }
 
-public class ConnectionProperties : MonoBehaviour
-{
+public class ConnectionProperties : MonoBehaviour {
     public bool IsOpen = false;
     public string OpenFromRoomId;
     public string OpenToRoomId;
@@ -20,11 +18,9 @@ public class ConnectionProperties : MonoBehaviour
 
     //public Material WallMaterialId
     [Button]
-    public void ToggleOpen()
-    {
+    public void ToggleOpen() {
         var canOpen = this.gameObject.GetComponentInChildren<CanOpen_Object>();
-        if (canOpen != null)
-        {
+        if (canOpen != null) {
             canOpen.SetOpennessImmediate(!this.IsOpen ? 1.0f : 0.0f);
         }
         this.IsOpen = !this.IsOpen;
diff --git a/unity/Assets/Scripts/Contains.cs b/unity/Assets/Scripts/Contains.cs
index df196a077b..75a3b0d87e 100644
--- a/unity/Assets/Scripts/Contains.cs
+++ b/unity/Assets/Scripts/Contains.cs
@@ -9,16 +9,14 @@
 // of the Receptacle Trigger Box, which gets confusing if an Object has multiple ReceptacleTriggerBoxes
 // with multiple Contains.cs scripts
 [System.Serializable]
-public class ReceptacleSpawnPoint
-{
+public class ReceptacleSpawnPoint {
     public BoxCollider ReceptacleBox; // the box the point is in
     public Vector3 Point; // Vector3 coordinate in world space, possible spawn location
 
     public Contains Script;
     public SimObjPhysics ParentSimObjPhys;
 
-    public ReceptacleSpawnPoint(Vector3 p, BoxCollider box, Contains c, SimObjPhysics parentsop)
-    {
+    public ReceptacleSpawnPoint(Vector3 p, BoxCollider box, Contains c, SimObjPhysics parentsop) {
         ReceptacleBox = box;
         Point = p;
         Script = c;
@@ -26,8 +24,7 @@ public ReceptacleSpawnPoint(Vector3 p, BoxCollider box, Contains c, SimObjPhysic
     }
 }
 
-public class Contains : MonoBehaviour
-{
+public class Contains : MonoBehaviour {
     [SerializeField]
     protected List<SimObjPhysics> CurrentlyContains = new List<SimObjPhysics>();
 
@@ -45,25 +42,20 @@ public class Contains : MonoBehaviour
 
     // Use this for initialization
 
-    void OnEnable()
-    {
+    void OnEnable() {
         // if the parent of this object has a SimObjPhysics component, grab a reference to it
-        if (myParent == null)
-        {
-            if (gameObject.GetComponentInParent<SimObjPhysics>().transform.gameObject)
-            {
+        if (myParent == null) {
+            if (gameObject.GetComponentInParent<SimObjPhysics>().transform.gameObject) {
                 myParent = gameObject.GetComponentInParent<SimObjPhysics>().transform.gameObject;
             }
         }
     }
 
-    void Start()
-    {
+    void Start() {
         // check that all objects with receptacles components have the correct Receptacle secondary property
 #if UNITY_EDITOR
         SimObjPhysics go = gameObject.GetComponentInParent<SimObjPhysics>();
-        if (!go.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-        {
+        if (!go.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
             Debug.LogError(
                 go.transform.name + " is missing Receptacle Secondary Property! please hook them up"
             );
@@ -72,8 +64,7 @@ void Start()
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // turn this on for debugging spawnpoints in editor
         // GetValidSpawnPoints(true);
 
@@ -89,18 +80,12 @@ void Update()
         // }
     }
 
-    protected bool hasAncestor(GameObject child, GameObject potentialAncestor)
-    {
-        if (child == potentialAncestor)
-        {
+    protected bool hasAncestor(GameObject child, GameObject potentialAncestor) {
+        if (child == potentialAncestor) {
             return true;
-        }
-        else if (child.transform.parent != null)
-        {
+        } else if (child.transform.parent != null) {
             return hasAncestor(child.transform.parent.gameObject, potentialAncestor);
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -108,8 +93,7 @@ protected bool hasAncestor(GameObject child, GameObject potentialAncestor)
     // public BoxCollider coll;
 
     // return a list of sim objects currently inside this trigger box as GameObjects
-    public List<GameObject> CurrentlyContainedGameObjects()
-    {
+    public List<GameObject> CurrentlyContainedGameObjects() {
         List<GameObject> objs = new List<GameObject>();
 
         BoxCollider b = this.GetComponent<BoxCollider>();
@@ -138,23 +122,19 @@ public List<GameObject> CurrentlyContainedGameObjects()
         // ok now create an overlap box using these values and return all contained objects
         foreach (
             Collider col in Physics.OverlapBox(worldCenter, worldHalfExtents, b.transform.rotation)
-        )
-        {
+        ) {
             // ignore triggers
-            if (col.GetComponentInParent<SimObjPhysics>() && !col.isTrigger)
-            {
+            if (col.GetComponentInParent<SimObjPhysics>() && !col.isTrigger) {
                 // grab reference to game object this collider is part of
                 SimObjPhysics sop = col.GetComponentInParent<SimObjPhysics>();
 
                 // don't add any colliders from our parent object, so things like a
                 // shelf or drawer nested inside another shelving unit or dresser sim object
                 // don't contain the object they are nested inside
-                if (!hasAncestor(this.transform.gameObject, sop.transform.gameObject))
-                {
+                if (!hasAncestor(this.transform.gameObject, sop.transform.gameObject)) {
                     // don't add repeat objects in case there were multiple
                     // colliders from the same object
-                    if (!objs.Contains(sop.transform.gameObject))
-                    {
+                    if (!objs.Contains(sop.transform.gameObject)) {
                         objs.Add(sop.transform.gameObject);
                     }
                 }
@@ -166,11 +146,9 @@ Collider col in Physics.OverlapBox(worldCenter, worldHalfExtents, b.transform.ro
 
     // return if this container object is occupied by any object(s) inside the trigger collider
     // used by ObjectSpecificReceptacle, so objects like stove burners, coffee machine, etc.
-    public bool isOccupied()
-    {
+    public bool isOccupied() {
         bool result = false;
-        if (CurrentlyContainedGameObjects().Count > 0)
-        {
+        if (CurrentlyContainedGameObjects().Count > 0) {
             result = true;
         }
 
@@ -178,12 +156,10 @@ public bool isOccupied()
     }
 
     // report back what is currently inside this receptacle as list of SimObjPhysics
-    public List<SimObjPhysics> CurrentlyContainedObjects()
-    {
+    public List<SimObjPhysics> CurrentlyContainedObjects() {
         List<SimObjPhysics> toSimObjPhysics = new List<SimObjPhysics>();
 
-        foreach (GameObject g in CurrentlyContainedGameObjects())
-        {
+        foreach (GameObject g in CurrentlyContainedGameObjects()) {
             toSimObjPhysics.Add(g.GetComponent<SimObjPhysics>());
         }
 
@@ -191,12 +167,10 @@ public List<SimObjPhysics> CurrentlyContainedObjects()
     }
 
     // report back a list of object ids of objects currently inside this receptacle
-    public List<string> CurrentlyContainedObjectIDs()
-    {
+    public List<string> CurrentlyContainedObjectIDs() {
         List<string> ids = new List<string>();
 
-        foreach (GameObject g in CurrentlyContainedGameObjects())
-        {
+        foreach (GameObject g in CurrentlyContainedGameObjects()) {
             ids.Add(g.GetComponent<SimObjPhysics>().ObjectID);
         }
 
@@ -204,8 +178,7 @@ public List<string> CurrentlyContainedObjectIDs()
     }
 
     //returns the gridpoints in local space relative to the trigger box collider of this Contains.cs object
-    public List<Vector3> GetValidSpawnPointsFromTriggerBoxLocalSpace(bool top = true)
-    {
+    public List<Vector3> GetValidSpawnPointsFromTriggerBoxLocalSpace(bool top = true) {
         Vector3 p1,
             p2,
             p4; // in case we need all the corners later for something...
@@ -235,24 +208,21 @@ public List<Vector3> GetValidSpawnPointsFromTriggerBoxLocalSpace(bool top = true
         Vector3 zdir = (p4 - p1).normalized; // direction in the -z direction to finish drawing grid
         float zdist = Vector3.Distance(p4, p1);
 
-        for (int i = 0; i < linepoints; i++)
-        {
+        for (int i = 0; i < linepoints; i++) {
             float x = p1.x + (p2.x - p1.x) * (lineincrement * i);
             float y = p1.y + (p2.y - p1.y) * (lineincrement * i);
             float z = p1.z + (p2.z - p1.z) * (lineincrement * i);
 
             PointsOnLineXdir[i] = new Vector3(x, y, z);
 
-            for (int j = 0; j < linepoints; j++)
-            {
+            for (int j = 0; j < linepoints; j++) {
                 gridpoints.Add(PointsOnLineXdir[i] + zdir * (zdist * (j * lineincrement)));
             }
         }
 
         //ok at this point all the grid points I believe are in world space??? sooo
         List<Vector3> localGridPoints = new List<Vector3>();
-        foreach (Vector3 point in gridpoints)
-        {
+        foreach (Vector3 point in gridpoints) {
             localGridPoints.Add(this.transform.InverseTransformPoint(point));
         }
 
@@ -260,8 +230,7 @@ public List<Vector3> GetValidSpawnPointsFromTriggerBoxLocalSpace(bool top = true
     }
 
     // returns a grid of points above the target receptacle
-    public List<Vector3> GetValidSpawnPointsFromTriggerBox(bool top = true)
-    {
+    public List<Vector3> GetValidSpawnPointsFromTriggerBox(bool top = true) {
         Vector3 p1,
             p2,
             p4; // in case we need all the corners later for something...
@@ -291,22 +260,19 @@ public List<Vector3> GetValidSpawnPointsFromTriggerBox(bool top = true)
         Vector3 zdir = (p4 - p1).normalized; // direction in the -z direction to finish drawing grid
         float zdist = Vector3.Distance(p4, p1);
 
-        for (int i = 0; i < linepoints; i++)
-        {
+        for (int i = 0; i < linepoints; i++) {
             float x = p1.x + (p2.x - p1.x) * (lineincrement * i);
             float y = p1.y + (p2.y - p1.y) * (lineincrement * i);
             float z = p1.z + (p2.z - p1.z) * (lineincrement * i);
 
             PointsOnLineXdir[i] = new Vector3(x, y, z);
 
-            for (int j = 0; j < linepoints; j++)
-            {
+            for (int j = 0; j < linepoints; j++) {
                 gridpoints.Add(PointsOnLineXdir[i] + zdir * (zdist * (j * lineincrement)));
             }
         }
 #if UNITY_EDITOR
-        foreach (Vector3 point in gridpoints)
-        {
+        foreach (Vector3 point in gridpoints) {
             //debug draw the gridpoints if you wanna see em
             Debug.DrawLine(point, point + new Vector3(0, 0.2f, 0), Color.red, 100f);
         }
@@ -318,8 +284,7 @@ public List<Vector3> GetValidSpawnPointsFromTriggerBox(bool top = true)
     // generate a grid of potential spawn points, set ReturnPointsClosestToAgent to true if
     // the list of points should be filtered closest to agent, if false
     // it will return all points on the receptacle regardless of agent proximity
-    public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController agent = null)
-    {
+    public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController agent = null) {
         List<ReceptacleSpawnPoint> PossibleSpawnPoints = new List<ReceptacleSpawnPoint>();
 
         Vector3 p1,
@@ -356,22 +321,19 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
         float zdist = Vector3.Distance(p4, p1);
         float ydist = Vector3.Distance(p1, p5);
 
-        for (int i = 0; i < linepoints; i++)
-        {
+        for (int i = 0; i < linepoints; i++) {
             float x = p1.x + (p2.x - p1.x) * (lineincrement * i);
             float y = p1.y + (p2.y - p1.y) * (lineincrement * i);
             float z = p1.z + (p2.z - p1.z) * (lineincrement * i);
 
             PointsOnLineXdir[i] = new Vector3(x, y, z);
 
-            for (int j = 0; j < linepoints; j++)
-            {
+            for (int j = 0; j < linepoints; j++) {
                 gridpoints.Add(PointsOnLineXdir[i] + zdir * (zdist * (j * lineincrement)));
             }
         }
 
-        foreach (Vector3 point in gridpoints)
-        {
+        foreach (Vector3 point in gridpoints) {
             // // quick test to see if this point on the grid is blocked by anything by raycasting down
             // // toward it
 
@@ -398,15 +360,12 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
                     ),
                     QueryTriggerInteraction.Collide
                 )
-            )
-            {
+            ) {
                 // IMPORTANT NOTE: For objects like Sinks and Bathtubs where the interior simobject (SinkBasin, BathtubBasin) are children, make sure the interior Contains scripts have their 'myParent' field
                 // set to the PARENT object of the sim object, not the sim object itself ie: SinkBasin's myParent = Sink
-                if (hit.transform == myParent.transform)
-                {
+                if (hit.transform == myParent.transform) {
                     // print("raycast hit: " + hit.transform.name);
-                    if (agent == null)
-                    {
+                    if (agent == null) {
                         PossibleSpawnPoints.Add(
                             new ReceptacleSpawnPoint(
                                 hit.point,
@@ -415,9 +374,7 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
                                 myParent.GetComponent<SimObjPhysics>()
                             )
                         );
-                    }
-                    else if (narrowDownValidSpawnPoints(agent, hit.point))
-                    {
+                    } else if (narrowDownValidSpawnPoints(agent, hit.point)) {
                         PossibleSpawnPoints.Add(
                             new ReceptacleSpawnPoint(
                                 hit.point,
@@ -432,8 +389,7 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
 
             Vector3 BottomPoint = point + -(ydir * ydist);
             // didn't hit anything that could obstruct, so this point is good to go
-            if (agent == null)
-            {
+            if (agent == null) {
                 PossibleSpawnPoints.Add(
                     new ReceptacleSpawnPoint(
                         BottomPoint,
@@ -442,9 +398,7 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
                         myParent.GetComponent<SimObjPhysics>()
                     )
                 );
-            }
-            else if (narrowDownValidSpawnPoints(agent, BottomPoint))
-            {
+            } else if (narrowDownValidSpawnPoints(agent, BottomPoint)) {
                 PossibleSpawnPoints.Add(
                     new ReceptacleSpawnPoint(
                         BottomPoint,
@@ -471,8 +425,7 @@ public List<ReceptacleSpawnPoint> GetValidSpawnPoints(BaseFPSAgentController age
     }
 
     // additional checks if the point is valid. Return true if it's valid
-    private bool narrowDownValidSpawnPoints(BaseFPSAgentController agent, Vector3 point)
-    {
+    private bool narrowDownValidSpawnPoints(BaseFPSAgentController agent, Vector3 point) {
         // get agent's camera point, get point to check, find the distance from agent camera point to point to check
 
         // set the distance so that it is within the radius maxvisdist from the agent
@@ -480,8 +433,7 @@ private bool narrowDownValidSpawnPoints(BaseFPSAgentController agent, Vector3 po
         tmpForCamera.y = point.y;
 
         // automatically rule out a point if it's beyond our max distance of visibility
-        if (Vector3.Distance(point, tmpForCamera) >= agent.maxVisibleDistance)
-        {
+        if (Vector3.Distance(point, tmpForCamera) >= agent.maxVisibleDistance) {
             return false;
         }
 
@@ -491,25 +443,20 @@ private bool narrowDownValidSpawnPoints(BaseFPSAgentController agent, Vector3 po
         Camera agentCam = agent.m_Camera;
 
         // no offset if the object is below the camera position - a slight offset to account for objects equal in y distance to the camera
-        if (point.y < agentCam.transform.position.y - 0.05f)
-        {
+        if (point.y < agentCam.transform.position.y - 0.05f) {
             // do this check if the point's y value is below the camera's y value
             // this check will be a raycast vision check from the camera to the point exactly
-            if (agent.CheckIfPointIsInViewport(point))
-            {
+            if (agent.CheckIfPointIsInViewport(point)) {
                 return true;
             }
-        }
-        else
-        {
+        } else {
             // do this check if the point's y value is above the agent camera. This means we are
             // trying to place an object on a shelf or something high up that we can't quite reach
             // in this case, modify the point that is checked for visibility by adding a little bit to the y
 
             // might want to adjust this offset amount, or even move this check to ensure object visibility after the
             // checkspawnarea corners are generated?
-            if (agent.CheckIfPointIsInViewport(point + new Vector3(0, 0.05f, 0)))
-            {
+            if (agent.CheckIfPointIsInViewport(point + new Vector3(0, 0.05f, 0))) {
                 return true;
             }
         }
@@ -519,8 +466,7 @@ private bool narrowDownValidSpawnPoints(BaseFPSAgentController agent, Vector3 po
 
     // used to check if a given Vector3 is inside this receptacle box in world space
     // use this to check if a SimObjectPhysics's corners are contained within this receptacle, if not then it doesn't fit
-    public bool CheckIfPointIsInsideReceptacleTriggerBox(Vector3 point)
-    {
+    public bool CheckIfPointIsInsideReceptacleTriggerBox(Vector3 point) {
         BoxCollider myBox = gameObject.GetComponent<BoxCollider>();
 
         point = myBox.transform.InverseTransformPoint(point) - myBox.center;
@@ -535,18 +481,14 @@ public bool CheckIfPointIsInsideReceptacleTriggerBox(Vector3 point)
             && point.y > -halfY
             && point.z < halfZ
             && point.z > -halfZ
-        )
-        {
+        ) {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
-    public bool CheckIfPointIsAboveReceptacleTriggerBox(Vector3 point)
-    {
+    public bool CheckIfPointIsAboveReceptacleTriggerBox(Vector3 point) {
         BoxCollider myBox = gameObject.GetComponent<BoxCollider>();
 
         point = myBox.transform.InverseTransformPoint(point) - myBox.center;
@@ -561,19 +503,15 @@ public bool CheckIfPointIsAboveReceptacleTriggerBox(Vector3 point)
             && point.y > -BIGY
             && point.z < halfZ
             && point.z > -halfZ
-        )
-        {
+        ) {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
 #if UNITY_EDITOR
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         BoxCollider b = GetComponent<BoxCollider>();
 
         // these are the 8 points making up the corner of the box. If ANY parents of this object have non uniform scales,
diff --git a/unity/Assets/Scripts/ContinuousMovement.cs b/unity/Assets/Scripts/ContinuousMovement.cs
index 74f15a693c..e64e37b1be 100644
--- a/unity/Assets/Scripts/ContinuousMovement.cs
+++ b/unity/Assets/Scripts/ContinuousMovement.cs
@@ -4,8 +4,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public interface MovableContinuous
-{
+public interface MovableContinuous {
     public bool ShouldHalt();
     public void ContinuousUpdate(float fixedDeltaTime);
     public ActionFinished FinishContinuousMove(BaseFPSAgentController controller);
@@ -13,18 +12,14 @@ public interface MovableContinuous
     // public string GetHaltMessage();
 }
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class ContinuousMovement
-    {
-        public static int unrollSimulatePhysics(IEnumerator enumerator, float fixedDeltaTime)
-        {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class ContinuousMovement {
+        public static int unrollSimulatePhysics(IEnumerator enumerator, float fixedDeltaTime) {
             int count = 0;
             PhysicsSceneManager.PhysicsSimulateCallCount = 0;
             var previousAutoSimulate = Physics.autoSimulation;
             Physics.autoSimulation = false;
-            while (enumerator.MoveNext())
-            {
+            while (enumerator.MoveNext()) {
                 // physics simulate happens in  updateTransformPropertyFixedUpdate as long
                 // as autoSimulation is off
                 count++;
@@ -42,8 +37,7 @@ public static IEnumerator rotate(
             float radiansPerSecond,
             bool returnToStartPropIfFailed = false,
             Quaternion? secTargetRotation = null
-        )
-        {
+        ) {
             bool teleport = (radiansPerSecond == float.PositiveInfinity) && fixedDeltaTime == 0f;
 
             float degreesPerSecond = radiansPerSecond * 180.0f / Mathf.PI;
@@ -53,8 +47,7 @@ public static IEnumerator rotate(
             Func<Transform, Quaternion, Quaternion> nextRotFunc = (t, target) =>
                 Quaternion.RotateTowards(t.rotation, target, fixedDeltaTime * degreesPerSecond);
 
-            if (teleport)
-            {
+            if (teleport) {
                 nextRotFunc = (t, target) => target;
             }
 
@@ -86,8 +79,7 @@ public static IEnumerator move(
             float unitsPerSecond,
             bool returnToStartPropIfFailed = false,
             bool localPosition = false
-        )
-        {
+        ) {
             bool teleport = (unitsPerSecond == float.PositiveInfinity) && fixedDeltaTime == 0f;
 
             Func<
@@ -114,23 +106,19 @@ public static IEnumerator move(
             Func<Transform, Vector3> getPosFunc;
             Action<Transform, Vector3> setPosFunc;
             Func<Transform, Vector3, Vector3> nextPosFunc;
-            if (localPosition)
-            {
+            if (localPosition) {
                 getPosFunc = (t) => t.localPosition;
                 setPosFunc = (t, pos) => t.localPosition = pos;
                 nextPosFunc = (t, direction) =>
                     t.localPosition + direction * unitsPerSecond * fixedDeltaTime;
-            }
-            else
-            {
+            } else {
                 getPosFunc = (t) => t.position;
                 setPosFunc = (t, pos) => t.position = pos;
                 nextPosFunc = (t, direction) =>
                     t.position + direction * unitsPerSecond * fixedDeltaTime;
             }
 
-            if (teleport)
-            {
+            if (teleport) {
                 nextPosFunc = (t, direction) => targetPosition;
             }
 
@@ -141,8 +129,7 @@ public static IEnumerator moveAB(
             MovableContinuous movable,
             ArticulatedAgentController controller,
             float fixedDeltaTime
-        )
-        {
+        ) {
             return continuousUpdateAB(
                 movable: movable,
                 controller: controller,
@@ -153,15 +140,12 @@ float fixedDeltaTime
         protected static IEnumerator finallyDestroyGameObjects(
             List<GameObject> gameObjectsToDestroy,
             IEnumerator steps
-        )
-        {
-            while (steps.MoveNext())
-            {
+        ) {
+            while (steps.MoveNext()) {
                 yield return steps.Current;
             }
 
-            foreach (GameObject go in gameObjectsToDestroy)
-            {
+            foreach (GameObject go in gameObjectsToDestroy) {
                 GameObject.Destroy(go);
             }
         }
@@ -175,8 +159,7 @@ public static IEnumerator rotateAroundPoint(
             float fixedDeltaTime,
             float degreesPerSecond,
             bool returnToStartPropIfFailed = false
-        )
-        {
+        ) {
             bool teleport = (degreesPerSecond == float.PositiveInfinity) && fixedDeltaTime == 0f;
 
             // To figure out how to translate/rotate the undateTransform
@@ -207,14 +190,12 @@ public static IEnumerator rotateAroundPoint(
                 Quaternion.Angle(current, target);
 
             Func<Transform, Quaternion> getRotFunc = (t) => t.rotation;
-            Action<Transform, Quaternion> setRotFunc = (t, newRotation) =>
-            {
+            Action<Transform, Quaternion> setRotFunc = (t, newRotation) => {
                 t.rotation = newRotation;
                 updateTransform.position = wristProxy.transform.position;
                 updateTransform.rotation = newRotation;
             };
-            Func<Transform, Quaternion, Quaternion> nextRotFunc = (t, target) =>
-            {
+            Func<Transform, Quaternion, Quaternion> nextRotFunc = (t, target) => {
                 return Quaternion.RotateTowards(
                     t.rotation,
                     target,
@@ -222,8 +203,7 @@ public static IEnumerator rotateAroundPoint(
                 );
             };
 
-            if (teleport)
-            {
+            if (teleport) {
                 nextRotFunc = (t, direction) => targetRotation;
             }
 
@@ -250,14 +230,11 @@ public static IEnumerator continuousUpdateAB(
             MovableContinuous movable,
             BaseFPSAgentController controller,
             float fixedDeltaTime
-        )
-        {
-            while (!movable.ShouldHalt())
-            {
+        ) {
+            while (!movable.ShouldHalt()) {
                 movable.ContinuousUpdate(fixedDeltaTime);
                 // TODO: Remove below?
-                if (!Physics.autoSimulation)
-                {
+                if (!Physics.autoSimulation) {
                     //Debug.Log("manual simulate from PhysicsManager");
                     PhysicsSceneManager.PhysicsSimulateTHOR(fixedDeltaTime);
                 }
@@ -289,8 +266,7 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
             double epsilon,
             T? secTarget = null
         )
-            where T : struct
-        {
+            where T : struct {
             T originalProperty = getProp(moveTransform);
             var previousProperty = originalProperty;
 
@@ -303,8 +279,7 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
             // yield return yieldInstruction;
 
             int transformIterations = 1;
-            if (secTarget != null)
-            {
+            if (secTarget != null) {
                 transformIterations = 2;
             }
 
@@ -315,16 +290,12 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
             float currentDistance = 0;
             bool haveGottenWithinEpsilon = currentDistance <= epsilon;
 
-            for (int i = 0; i < transformIterations; i++)
-            {
+            for (int i = 0; i < transformIterations; i++) {
                 // This syntax is a new method of pattern-matching that was introduced in C# 7.0, where the type check and
                 // variable assignment are performed in a single step
-                if (i == 0)
-                {
+                if (i == 0) {
                     currentTarget = target;
-                }
-                else
-                {
+                } else {
                     currentTarget = (T)secTarget;
                 }
 
@@ -336,8 +307,7 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
                 //     Debug.Log("Oh, currentTarget is " + printTarget.eulerAngles.y);
                 // }
 
-                while (!movable.ShouldHalt())
-                {
+                while (!movable.ShouldHalt()) {
                     // TODO: put in movable && !collisionListener.TransformChecks(controller, moveTransform)) {
                     previousProperty = getProp(moveTransform);
 
@@ -351,12 +321,9 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
                     if (
                         nextDistance <= epsilon
                         || nextDistance > distanceMetric((T)currentTarget, getProp(moveTransform))
-                    )
-                    {
+                    ) {
                         setProp(moveTransform, (T)currentTarget);
-                    }
-                    else
-                    {
+                    } else {
                         setProp(moveTransform, next);
                     }
 
@@ -379,16 +346,12 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
 
                     currentDistance = distanceMetric((T)currentTarget, getProp(moveTransform));
 
-                    if (currentDistance <= epsilon)
-                    {
+                    if (currentDistance <= epsilon) {
                         // This logic is a bit unintuitive but it ensures we run the
                         // `setProp(moveTransform, currentTarget);` line above once we get within epsilon
-                        if (haveGottenWithinEpsilon)
-                        {
+                        if (haveGottenWithinEpsilon) {
                             break;
-                        }
-                        else
-                        {
+                        } else {
                             haveGottenWithinEpsilon = true;
                         }
                     }
@@ -397,8 +360,7 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
 
             //Debug.Log("4");
             T resetProp = previousProperty;
-            if (returnToStartPropIfFailed)
-            {
+            if (returnToStartPropIfFailed) {
                 resetProp = originalProperty;
             }
             //Debug.Log("about to continuousMoveFinish");
@@ -411,8 +373,7 @@ public static IEnumerator updateTransformPropertyFixedUpdate<T>(
             //     resetProp
             // );
             var actionFinished = movable.FinishContinuousMove(controller);
-            if (!actionFinished.success)
-            {
+            if (!actionFinished.success) {
                 setProp(moveTransform, resetProp);
             }
 
diff --git a/unity/Assets/Scripts/Convertable.cs b/unity/Assets/Scripts/Convertable.cs
index f8c3a2b793..c5ee20f281 100644
--- a/unity/Assets/Scripts/Convertable.cs
+++ b/unity/Assets/Scripts/Convertable.cs
@@ -4,19 +4,16 @@
 using UnityEngine;
 
 [Serializable]
-public class SimObjState
-{
+public class SimObjState {
     public GameObject Obj;
     public SimObjType Type;
 }
 
 [ExecuteInEditMode]
-public class Convertable : MonoBehaviour
-{
+public class Convertable : MonoBehaviour {
     public SimObjState[] States;
     public int DefaultState = 0;
-    public int CurrentState
-    {
+    public int CurrentState {
         get { return currentState; }
     }
 #if UNITY_EDITOR
@@ -26,57 +23,43 @@ public int CurrentState
     int currentState = -1;
     SimObj parentObj;
 
-    void OnEnable()
-    {
-        if (Application.isPlaying)
-        {
+    void OnEnable() {
+        if (Application.isPlaying) {
             currentState = DefaultState;
         }
     }
 
-    void Update()
-    {
-        if (parentObj == null)
-        {
+    void Update() {
+        if (parentObj == null) {
             parentObj = gameObject.GetComponent<SimObj>();
         }
 
         // anim state is 1-4
         int animState = -1;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             animState = parentObj.Animator.GetInteger("AnimState1");
         }
 #if UNITY_EDITOR
-        else
-        {
+        else {
             animState = EditorState + 1;
         }
 #endif
-        if (animState > States.Length)
-        {
+        if (animState > States.Length) {
             animState = -1;
         }
 
         // stateIndex is 0-3
         int stateIndex = animState - 1;
-        if (currentState != stateIndex && stateIndex >= 0)
-        {
+        if (currentState != stateIndex && stateIndex >= 0) {
             currentState = stateIndex;
-            for (int i = 0; i < States.Length; i++)
-            {
-                if (i == currentState)
-                {
+            for (int i = 0; i < States.Length; i++) {
+                if (i == currentState) {
                     parentObj.Type = States[i].Type;
-                    if (States[i].Obj != null)
-                    {
+                    if (States[i].Obj != null) {
                         States[i].Obj.SetActive(true);
                     }
-                }
-                else
-                {
-                    if (States[i].Obj != null)
-                    {
+                } else {
+                    if (States[i].Obj != null) {
                         States[i].Obj.SetActive(false);
                     }
                 }
diff --git a/unity/Assets/Scripts/CookObject.cs b/unity/Assets/Scripts/CookObject.cs
index de8523604e..bf46dc2a9c 100644
--- a/unity/Assets/Scripts/CookObject.cs
+++ b/unity/Assets/Scripts/CookObject.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CookObject : MonoBehaviour
-{
+public class CookObject : MonoBehaviour {
     // Meshes that require different materials when in on/off state
     [Header("Objects that need Mat Swaps")]
     [SerializeField]
@@ -12,45 +11,37 @@ public class CookObject : MonoBehaviour
     [SerializeField]
     private bool isCooked = false;
 
-    void Start()
-    {
+    void Start() {
 #if UNITY_EDITOR
         if (
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeCooked)
-        )
-        {
+        ) {
             Debug.LogError(gameObject.name + " is missing the CanBeCooked secondary property!");
         }
 #endif
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
 #if UNITY_EDITOR
-        if (Input.GetKeyDown(KeyCode.Minus))
-        {
+        if (Input.GetKeyDown(KeyCode.Minus)) {
             Cook();
         }
 #endif
     }
 
     // use this to return info on if this object is toasted or not
-    public bool IsCooked()
-    {
+    public bool IsCooked() {
         return isCooked;
     }
 
     // this will swap the material of this object to toasted. There is no
     // un-toast function because uh... you can't un toast bread?
-    public void Cook()
-    {
-        if (MaterialSwapObjects.Length > 0)
-        {
-            for (int i = 0; i < MaterialSwapObjects.Length; i++)
-            {
+    public void Cook() {
+        if (MaterialSwapObjects.Length > 0) {
+            for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                 MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                     MaterialSwapObjects[i].OnMaterials;
             }
diff --git a/unity/Assets/Scripts/CopyLightingSettings.cs b/unity/Assets/Scripts/CopyLightingSettings.cs
index 0966364a12..a68a1fb7ae 100644
--- a/unity/Assets/Scripts/CopyLightingSettings.cs
+++ b/unity/Assets/Scripts/CopyLightingSettings.cs
@@ -4,8 +4,7 @@
 using System.Reflection;
 
 // Latest version at https://bitbucket.org/snippets/pschraut/LeykeL
-static class CopyLightingSettings
-{
+static class CopyLightingSettings {
     //
     // Written by Peter Schraut
     //     http://www.console-dev.de
@@ -32,8 +31,7 @@ static class CopyLightingSettings
 #endif
 
     [MenuItem(k_CopySettingsMenuPath, priority = 200)]
-    static void CopySettings()
-    {
+    static void CopySettings() {
         UnityEngine.Object lightmapSettings;
         if (
             !TryGetSettings(
@@ -41,14 +39,12 @@ static void CopySettings()
                 "GetLightmapSettings",
                 out lightmapSettings
             )
-        )
-        {
+        ) {
             return;
         }
 
         UnityEngine.Object renderSettings;
-        if (!TryGetSettings(typeof(RenderSettings), "GetRenderSettings", out renderSettings))
-        {
+        if (!TryGetSettings(typeof(RenderSettings), "GetRenderSettings", out renderSettings)) {
             return;
         }
 
@@ -57,8 +53,7 @@ out lightmapSettings
     }
 
     [MenuItem(k_PasteSettingsMenuPath, priority = 201)]
-    static void PasteSettings()
-    {
+    static void PasteSettings() {
         UnityEngine.Object lightmapSettings;
         if (
             !TryGetSettings(
@@ -66,14 +61,12 @@ static void PasteSettings()
                 "GetLightmapSettings",
                 out lightmapSettings
             )
-        )
-        {
+        ) {
             return;
         }
 
         UnityEngine.Object renderSettings;
-        if (!TryGetSettings(typeof(RenderSettings), "GetRenderSettings", out renderSettings))
-        {
+        if (!TryGetSettings(typeof(RenderSettings), "GetRenderSettings", out renderSettings)) {
             return;
         }
 
@@ -84,30 +77,24 @@ out lightmapSettings
     }
 
     [MenuItem(k_PasteSettingsMenuPath, validate = true)]
-    static bool PasteValidate()
-    {
+    static bool PasteValidate() {
         return s_SourceLightmapSettings != null && s_SourceRenderSettings != null;
     }
 
-    static void CopyInternal(SerializedObject source, SerializedObject dest)
-    {
+    static void CopyInternal(SerializedObject source, SerializedObject dest) {
         var prop = source.GetIterator();
-        while (prop.Next(true))
-        {
+        while (prop.Next(true)) {
             var copyProperty = true;
             foreach (
                 var propertyName in new[] { "m_Sun", "m_FileID", "m_PathID", "m_ObjectHideFlags" }
-            )
-            {
-                if (string.Equals(prop.name, propertyName, System.StringComparison.Ordinal))
-                {
+            ) {
+                if (string.Equals(prop.name, propertyName, System.StringComparison.Ordinal)) {
                     copyProperty = false;
                     break;
                 }
             }
 
-            if (copyProperty)
-            {
+            if (copyProperty) {
                 dest.CopyFromSerializedProperty(prop);
             }
         }
@@ -115,13 +102,11 @@ static void CopyInternal(SerializedObject source, SerializedObject dest)
         dest.ApplyModifiedProperties();
     }
 
-    static bool TryGetSettings(System.Type type, string methodName, out UnityEngine.Object settings)
-    {
+    static bool TryGetSettings(System.Type type, string methodName, out UnityEngine.Object settings) {
         settings = null;
 
         var method = type.GetMethod(methodName, BindingFlags.Static | BindingFlags.NonPublic);
-        if (method == null)
-        {
+        if (method == null) {
             Debug.LogErrorFormat(
                 "CopyLightingSettings: Could not find {0}.{1}",
                 type.Name,
@@ -131,8 +116,7 @@ static bool TryGetSettings(System.Type type, string methodName, out UnityEngine.
         }
 
         var value = method.Invoke(null, null) as UnityEngine.Object;
-        if (value == null)
-        {
+        if (value == null) {
             Debug.LogErrorFormat(
                 "CopyLightingSettings: Could get data from {0}.{1}",
                 type.Name,
diff --git a/unity/Assets/Scripts/CrackedCameraManager.cs b/unity/Assets/Scripts/CrackedCameraManager.cs
index 83377b7506..747c0587eb 100644
--- a/unity/Assets/Scripts/CrackedCameraManager.cs
+++ b/unity/Assets/Scripts/CrackedCameraManager.cs
@@ -2,12 +2,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CrackedCameraManager : MonoBehaviour
-{
+public class CrackedCameraManager : MonoBehaviour {
     public List<GameObject> cracks;
 
-    public void SpawnCrack(int seed = 0)
-    {
+    public void SpawnCrack(int seed = 0) {
         UnityEngine.Random.InitState(seed);
 
         GameObject whichCrack = cracks[Random.Range(0, cracks.Count)];
diff --git a/unity/Assets/Scripts/CreatePrefab.cs b/unity/Assets/Scripts/CreatePrefab.cs
index 6d5484d81a..80b9b0346d 100644
--- a/unity/Assets/Scripts/CreatePrefab.cs
+++ b/unity/Assets/Scripts/CreatePrefab.cs
@@ -4,14 +4,11 @@
 using System.Collections;
 using UnityEditor;
 
-public class CreatePrefab : MonoBehaviour
-{
+public class CreatePrefab : MonoBehaviour {
     [MenuItem("Extras/Create Prefab From Selection")]
-    static void DoCreatePrefab()
-    {
+    static void DoCreatePrefab() {
         Transform[] transforms = Selection.transforms;
-        foreach (Transform t in transforms)
-        {
+        foreach (Transform t in transforms) {
             PrefabUtility.SaveAsPrefabAsset(
                 t.gameObject,
                 "Assets/Prefabs/" + t.gameObject.name + ".prefab"
diff --git a/unity/Assets/Scripts/DebugDiscreteAgentController.cs b/unity/Assets/Scripts/DebugDiscreteAgentController.cs
index 8e74af63fe..5ab2aa575b 100644
--- a/unity/Assets/Scripts/DebugDiscreteAgentController.cs
+++ b/unity/Assets/Scripts/DebugDiscreteAgentController.cs
@@ -4,10 +4,8 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class DebugDiscreteAgentController : MonoBehaviour
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class DebugDiscreteAgentController : MonoBehaviour {
         public GameObject InputFieldObj = null;
         public AgentManager AManager = null;
         private InputField inputField;
@@ -16,8 +14,7 @@ public class DebugDiscreteAgentController : MonoBehaviour
         private GameObject InputMode_Text = null;
 
         // Start is called before the first frame update
-        void Start()
-        {
+        void Start() {
             InputFieldObj = GameObject.Find("DebugCanvasPhysics/InputField");
             var Debug_Canvas = GameObject.Find("DebugCanvasPhysics");
             inputField = InputFieldObj.GetComponent<InputField>();
@@ -29,32 +26,27 @@ void Start()
             Cursor.visible = true;
             Cursor.lockState = CursorLockMode.None;
 
-            if (this.isActiveAndEnabled)
-            {
+            if (this.isActiveAndEnabled) {
                 Debug_Canvas.GetComponent<Canvas>().enabled = true;
                 Cursor.visible = true;
                 Cursor.lockState = CursorLockMode.None;
             }
         }
 
-        BaseFPSAgentController CurrentActiveController()
-        {
+        BaseFPSAgentController CurrentActiveController() {
             return AManager.PrimaryAgent;
         }
 
-        public void OnEnable()
-        {
+        public void OnEnable() {
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
-            if (InputMode_Text)
-            {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "Text Input Mode";
             }
         }
 
         public void OnDisable() { }
 
-        void Update()
-        {
+        void Update() {
             // use these for the Breakable Window demo video
             // if(Input.GetKeyDown(KeyCode.P))
             // {
@@ -88,17 +80,14 @@ void Update()
             // }
 
             // if we press enter, select the input field
-            if (CurrentActiveController().ReadyForCommand)
-            {
-                if (Input.GetKeyDown(KeyCode.Return))
-                {
+            if (CurrentActiveController().ReadyForCommand) {
+                if (Input.GetKeyDown(KeyCode.Return)) {
                     UnityEngine.EventSystems.EventSystem.current.SetSelectedGameObject(
                         InputFieldObj
                     );
                 }
 
-                if (!inputField.isFocused)
-                {
+                if (!inputField.isFocused) {
                     bool shiftHeld =
                         Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
                     bool altHeld = Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt);
@@ -109,226 +98,164 @@ void Update()
                     bool isArticulated =
                         CurrentActiveController().GetType() == typeof(ArticulatedAgentController);
                     Dictionary<string, object> action = new Dictionary<string, object>();
-                    var physicsSimulationParams = new PhysicsSimulationParams()
-                    {
+                    var physicsSimulationParams = new PhysicsSimulationParams() {
                         autoSimulation = false
                     };
                     bool useLimits = true;
 
-                    if (noModifier)
-                    {
+                    if (noModifier) {
                         float WalkMagnitude = 0.25f;
 
                         action["action"] = "";
                         action["physicsSimulationParams"] = physicsSimulationParams;
 
-                        if (isArticulated)
-                        {
-                            if (Input.GetKeyDown(KeyCode.W))
-                            {
+                        if (isArticulated) {
+                            if (Input.GetKeyDown(KeyCode.W)) {
                                 action["action"] = "MoveAgent";
                                 action["moveMagnitude"] = WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.S))
-                            {
+                            if (Input.GetKeyDown(KeyCode.S)) {
                                 action["action"] = "MoveAgent";
                                 action["moveMagnitude"] = -WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.LeftArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.LeftArrow)) {
                                 action["action"] = "RotateLeft";
                                 action["degrees"] = 30f;
                                 action["speed"] = 22.5f;
                                 action["acceleration"] = 22.5f;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.RightArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.RightArrow)) {
                                 action["action"] = "RotateRight";
                                 action["degrees"] = 30f;
                                 action["speed"] = 22.5f;
                                 action["acceleration"] = 22.5f;
                             }
-                        }
-                        else
-                        {
-                            if (Input.GetKeyDown(KeyCode.W))
-                            {
+                        } else {
+                            if (Input.GetKeyDown(KeyCode.W)) {
                                 action["action"] = "MoveAhead";
                                 action["moveMagnitude"] = WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.S))
-                            {
+                            if (Input.GetKeyDown(KeyCode.S)) {
                                 action["action"] = "MoveBack";
                                 action["moveMagnitude"] = WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.A))
-                            {
+                            if (Input.GetKeyDown(KeyCode.A)) {
                                 action["action"] = "MoveLeft";
                                 action["moveMagnitude"] = WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.D))
-                            {
+                            if (Input.GetKeyDown(KeyCode.D)) {
                                 action["action"] = "MoveRight";
                                 action["moveMagnitude"] = WalkMagnitude;
                             }
 
-                            if (Input.GetKeyDown(KeyCode.UpArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.UpArrow)) {
                                 action["action"] = "LookUp";
                             }
 
-                            if (Input.GetKeyDown(KeyCode.DownArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.DownArrow)) {
                                 action["action"] = "LookDown";
                             }
 
-                            if (Input.GetKeyDown(KeyCode.LeftArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.LeftArrow)) {
                                 action["action"] = "RotateLeft";
                             }
 
-                            if (Input.GetKeyDown(KeyCode.RightArrow))
-                            {
+                            if (Input.GetKeyDown(KeyCode.RightArrow)) {
                                 action["action"] = "RotateRight";
                             }
                         }
 
-                        if ((string)action["action"] != "")
-                        {
+                        if ((string)action["action"] != "") {
                             if (
                                 ((string)action["action"]).Contains("Move")
                                 && CurrentActiveController().GetType()
                                     == typeof(KinovaArmAgentController)
-                            )
-                            {
+                            ) {
                                 action["returnToStart"] = false;
                             }
                             this.CurrentActiveController().ProcessControlCommand(action);
                         }
-                    }
-                    else if (armMoveMode)
-                    {
+                    } else if (armMoveMode) {
                         var actionName = "MoveArmRelative";
                         var localPos = new Vector3(0, 0, 0);
                         float ArmMoveMagnitude = 0.05f;
 
-                        if (isArticulated)
-                        {
+                        if (isArticulated) {
                             ArmMoveMagnitude = 0.1f;
                             float speed = 0.5f;
                             action["physicsSimulationParams"] = physicsSimulationParams;
 
-                            if (Input.GetKeyDown(KeyCode.W))
-                            {
+                            if (Input.GetKeyDown(KeyCode.W)) {
                                 action["action"] = "MoveArm";
                                 action["position"] = new Vector3(0f, 0f, ArmMoveMagnitude);
                                 action["speed"] = speed;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.S))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.S)) {
                                 action["action"] = "MoveArm";
                                 action["position"] = new Vector3(0f, 0f, -ArmMoveMagnitude);
                                 action["speed"] = speed;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.UpArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.UpArrow)) {
                                 action["action"] = "MoveArmBaseUp";
                                 action["distance"] = 0.2f;
                                 action["speed"] = speed;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.DownArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.DownArrow)) {
                                 action["action"] = "MoveArmBaseDown";
                                 action["distance"] = 0.2f;
                                 action["speed"] = speed;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.Q))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.Q)) {
                                 action["action"] = "RotateWristRelative";
                                 action["yaw"] = -30f;
                                 action["speed"] = 1000f;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.E))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.E)) {
                                 action["action"] = "RotateWristRelative";
                                 action["yaw"] = 30f;
                                 action["speed"] = 1000f;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.P))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.P)) {
                                 action["action"] = "PickupObject";
                                 // Doesn't matter we can keep them
                                 action.Remove("physicsSimulationParams");
-                            }
-                            else if (Input.GetKeyDown(KeyCode.D))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.D)) {
                                 action["action"] = "ReleaseObject";
                                 // Doesn't matter we can keep them
                                 action.Remove("physicsSimulationParams");
-                            }
-                            else
-                            {
+                            } else {
                                 actionName = "";
                             }
 
-                            if (actionName != "")
-                            {
-                                if (((string)action["action"]).StartsWith("MoveArm"))
-                                {
+                            if (actionName != "") {
+                                if (((string)action["action"]).StartsWith("MoveArm")) {
                                     action["useLimits"] = useLimits;
                                 }
                                 this.CurrentActiveController().ProcessControlCommand(action);
                             }
-                        }
-                        else
-                        {
-                            if (Input.GetKeyDown(KeyCode.W))
-                            {
+                        } else {
+                            if (Input.GetKeyDown(KeyCode.W)) {
                                 localPos.y += ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.S))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.S)) {
                                 localPos.y -= ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.UpArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.UpArrow)) {
                                 localPos.z += ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.DownArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.DownArrow)) {
                                 localPos.z -= ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.LeftArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.LeftArrow)) {
                                 localPos.x -= ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.RightArrow))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.RightArrow)) {
                                 localPos.x += ArmMoveMagnitude;
-                            }
-                            else if (Input.GetKeyDown(KeyCode.P))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.P)) {
                                 actionName = "PickupObject";
-                            }
-                            else if (Input.GetKeyDown(KeyCode.D))
-                            {
+                            } else if (Input.GetKeyDown(KeyCode.D)) {
                                 actionName = "ReleaseObject";
-                            }
-                            else
-                            {
+                            } else {
                                 actionName = "";
                             }
-                            if (actionName != "")
-                            {
+                            if (actionName != "") {
                                 action["action"] = actionName;
-                                if (localPos.magnitude != 0)
-                                {
+                                if (localPos.magnitude != 0) {
                                     action["offset"] = localPos;
                                     //action["fixedDeltaTime"] = fixedDeltaTime;
                                     action["speed"] = 0.1;
@@ -337,9 +264,7 @@ void Update()
                                 this.CurrentActiveController().ProcessControlCommand(action);
                             }
                         }
-                    }
-                    else if (armRotateMode)
-                    {
+                    } else if (armRotateMode) {
                         var actionName = "RotateWristRelative";
                         float rotateMag = 30f;
                         float pitch = 0f;
@@ -347,60 +272,39 @@ void Update()
                         float roll = 0f;
                         float degrees = 0f;
 
-                        if (Input.GetKeyDown(KeyCode.W))
-                        {
+                        if (Input.GetKeyDown(KeyCode.W)) {
                             roll += rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.S))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.S)) {
                             roll -= rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.UpArrow))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.UpArrow)) {
                             pitch += rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.DownArrow))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.DownArrow)) {
                             pitch -= rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.LeftArrow))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.LeftArrow)) {
                             yaw -= rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.RightArrow))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.RightArrow)) {
                             yaw += rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.E))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.E)) {
                             actionName = "RotateElbowRelative";
                             degrees += rotateMag;
-                        }
-                        else if (Input.GetKeyDown(KeyCode.Q))
-                        {
+                        } else if (Input.GetKeyDown(KeyCode.Q)) {
                             // Why Q/E rather than A/D? Because apparently
                             // shift+alt+A is a Unity shortcut and Unity
                             // doesn't provide the ability to disable shortcuts in
                             // play mode despite this being a feature request since 2013.
                             actionName = "RotateElbowRelative";
                             degrees -= rotateMag;
-                        }
-                        else
-                        {
+                        } else {
                             actionName = "";
                         }
 
-                        if (actionName != "")
-                        {
+                        if (actionName != "") {
                             action["action"] = actionName;
-                            if (actionName == "RotateWristRelative")
-                            {
+                            if (actionName == "RotateWristRelative") {
                                 action["pitch"] = pitch;
                                 action["yaw"] = yaw;
                                 action["roll"] = roll;
-                            }
-                            else if (actionName == "RotateElbowRelative")
-                            {
+                            } else if (actionName == "RotateElbowRelative") {
                                 action["degrees"] = degrees;
                             }
                             this.CurrentActiveController().ProcessControlCommand(action);
diff --git a/unity/Assets/Scripts/DebugFPSAgentController.cs b/unity/Assets/Scripts/DebugFPSAgentController.cs
index b41b6c79a3..b2044fafcf 100644
--- a/unity/Assets/Scripts/DebugFPSAgentController.cs
+++ b/unity/Assets/Scripts/DebugFPSAgentController.cs
@@ -12,11 +12,9 @@
 using UnityStandardAssets.Utility;
 using Random = UnityEngine.Random;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [RequireComponent(typeof(CharacterController))]
-    public class DebugFPSAgentController : MonoBehaviour
-    {
+    public class DebugFPSAgentController : MonoBehaviour {
         // for use with mouse/keyboard input
         [SerializeField]
         protected bool m_IsWalking;
@@ -67,8 +65,7 @@ public class DebugFPSAgentController : MonoBehaviour
 
         protected bool enableHighlightShader = true;
 
-        private void Start()
-        {
+        private void Start() {
             m_CharacterController = GetComponent<CharacterController>();
             m_Camera = Camera.main;
             m_MouseLook.Init(transform, m_Camera.transform);
@@ -94,8 +91,7 @@ private void Start()
             );
 
             // if this component is enabled, turn on the targeting reticle and target text
-            if (this.isActiveAndEnabled)
-            {
+            if (this.isActiveAndEnabled) {
                 Debug_Canvas.GetComponent<Canvas>().enabled = true;
                 Cursor.visible = false;
                 Cursor.lockState = CursorLockMode.Locked;
@@ -111,8 +107,7 @@ private void Start()
 #endif
         }
 
-        public Vector3 ScreenPointMoveHand(float yOffset)
-        {
+        public Vector3 ScreenPointMoveHand(float yOffset) {
             RaycastHit hit;
             Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
             // shoot a ray out based on mouse position
@@ -120,30 +115,24 @@ public Vector3 ScreenPointMoveHand(float yOffset)
             return hit.point + new Vector3(0, yOffset, 0);
         }
 
-        public void HideHUD()
-        {
-            if (InputMode_Text != null)
-            {
+        public void HideHUD() {
+            if (InputMode_Text != null) {
                 InputMode_Text.SetActive(false);
             }
-            if (InputFieldObj != null)
-            {
+            if (InputFieldObj != null) {
                 InputFieldObj.SetActive(false);
             }
             var background = GameObject.Find("DebugCanvasPhysics/InputModeText_Background");
-            if (background != null)
-            {
+            if (background != null) {
                 background.SetActive(false);
             }
         }
 
-        public void SetScroll2DEnabled(bool enabled)
-        {
+        public void SetScroll2DEnabled(bool enabled) {
             this.scroll2DEnabled = enabled;
         }
 
-        public void OnEnable()
-        {
+        public void OnEnable() {
             FPSEnabled = true;
             originalPhysicsAutosimulation = Physics.autoSimulation;
             Physics.autoSimulation = true;
@@ -152,8 +141,7 @@ public void OnEnable()
 
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
             InputFieldObj = GameObject.Find("DebugCanvasPhysics/InputField");
-            if (InputMode_Text)
-            {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "FPS Mode";
             }
 
@@ -162,18 +150,15 @@ public void OnEnable()
             Debug_Canvas.GetComponent<Canvas>().enabled = true;
         }
 
-        public void OnDisable()
-        {
+        public void OnDisable() {
             DisableMouseControl();
             //  if (InputFieldObj) {
             //     InputFieldObj.SetActive(true);
             //  }
         }
 
-        public void EnableMouseControl()
-        {
-            if (InputMode_Text)
-            {
+        public void EnableMouseControl() {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "FPS Mode (mouse free)";
             }
             FPSEnabled = true;
@@ -183,10 +168,8 @@ public void EnableMouseControl()
             Physics.autoSimulation = true;
         }
 
-        public void DisableMouseControl()
-        {
-            if (InputMode_Text)
-            {
+        public void DisableMouseControl() {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "FPS Mode";
             }
             FPSEnabled = false;
@@ -195,20 +178,14 @@ public void DisableMouseControl()
             Physics.autoSimulation = originalPhysicsAutosimulation;
         }
 
-        private void DebugKeyboardControls()
-        {
-            if (InputFieldObj != null)
-            {
+        private void DebugKeyboardControls() {
+            if (InputFieldObj != null) {
                 InputField inField = InputFieldObj.GetComponentInChildren<InputField>();
-                if (inField != null)
-                {
-                    if (inField.isFocused)
-                    {
+                if (inField != null) {
+                    if (inField.isFocused) {
                         highlightController.ThrowEnabled = false;
                         return;
-                    }
-                    else
-                    {
+                    } else {
                         highlightController.ThrowEnabled = true;
                     }
                 }
@@ -216,16 +193,12 @@ private void DebugKeyboardControls()
 
             // swap between text input and not
 #if !UNITY_WEBGL
-            if (Input.GetKeyDown(KeyCode.BackQuote) || Input.GetKeyDown(KeyCode.Escape))
-            {
+            if (Input.GetKeyDown(KeyCode.BackQuote) || Input.GetKeyDown(KeyCode.Escape)) {
                 // Switch to Text Mode
-                if (FPSEnabled)
-                {
+                if (FPSEnabled) {
                     DisableMouseControl();
                     return;
-                }
-                else
-                {
+                } else {
                     EnableMouseControl();
                     return;
                 }
@@ -233,13 +206,11 @@ private void DebugKeyboardControls()
 #endif
 
             // 1D Scroll for hand movement
-            if (!scroll2DEnabled && this.PhysicsController.WhatAmIHolding() != null)
-            {
+            if (!scroll2DEnabled && this.PhysicsController.WhatAmIHolding() != null) {
                 var scrollAmount = Input.GetAxis("Mouse ScrollWheel");
 
                 var eps = 1e-6;
-                if (Mathf.Abs(scrollAmount) > eps)
-                {
+                if (Mathf.Abs(scrollAmount) > eps) {
                     // webGL action
                     var action = new Dictionary<string, object>()
                     {
@@ -251,8 +222,7 @@ private void DebugKeyboardControls()
             }
         }
 
-        private void Update()
-        {
+        private void Update() {
             highlightController.UpdateHighlightedObject(
                 new Vector3(Screen.width / 2, Screen.height / 2)
             );
@@ -262,27 +232,21 @@ private void Update()
 
             ///////////////////////////////////////////////////////////////////////////
             // we are not in focus mode, so use WASD and mouse to move around
-            if (FPSEnabled)
-            {
+            if (FPSEnabled) {
                 FPSInput();
-                if (Cursor.visible == false)
-                {
+                if (Cursor.visible == false) {
                     // accept input to update view based on mouse input
                     MouseRotateView();
                 }
             }
         }
 
-        public void OnGUI()
-        {
-            if (Event.current.type == EventType.ScrollWheel && scroll2DEnabled)
-            {
-                if (this.PhysicsController.WhatAmIHolding() != null)
-                {
+        public void OnGUI() {
+            if (Event.current.type == EventType.ScrollWheel && scroll2DEnabled) {
+                if (this.PhysicsController.WhatAmIHolding() != null) {
                     var scrollAmount = Event.current.delta;
                     var eps = 1e-6;
-                    if (Mathf.Abs(scrollAmount.x) > eps || Mathf.Abs(scrollAmount.y) > eps)
-                    {
+                    if (Mathf.Abs(scrollAmount.x) > eps || Mathf.Abs(scrollAmount.y) > eps) {
                         // Actioned called through webGL, using dynamic not supported by IL2CPP
                         var action = new Dictionary<string, object>()
                         {
@@ -297,8 +261,7 @@ public void OnGUI()
             }
         }
 
-        private void GetInput(out float speed)
-        {
+        private void GetInput(out float speed) {
             // Read input
             float horizontal = CrossPlatformInputManager.GetAxis("Horizontal");
             float vertical = CrossPlatformInputManager.GetAxis("Vertical");
@@ -315,24 +278,20 @@ private void GetInput(out float speed)
             m_Input = new Vector2(horizontal, vertical);
 
             // normalize input if it exceeds 1 in combined length:
-            if (m_Input.sqrMagnitude > 1)
-            {
+            if (m_Input.sqrMagnitude > 1) {
                 m_Input.Normalize();
             }
         }
 
-        public MouseLook GetMouseLook()
-        {
+        public MouseLook GetMouseLook() {
             return m_MouseLook;
         }
 
-        private void MouseRotateView()
-        {
+        private void MouseRotateView() {
             m_MouseLook.LookRotation(transform, m_Camera.transform);
         }
 
-        private void FPSInput()
-        {
+        private void FPSInput() {
             // take WASD input and do magic, turning it into movement!
             float speed;
             GetInput(out speed);
@@ -359,8 +318,7 @@ private void FPSInput()
             m_MoveDir += Physics.gravity * m_GravityMultiplier * Time.deltaTime;
 
             // added this check so that move is not called if/when the Character Controller's capsule is disabled. Right now the capsule is being disabled when open/close animations are in progress so yeah there's that
-            if (m_CharacterController.enabled == true)
-            {
+            if (m_CharacterController.enabled == true) {
                 m_CharacterController.Move(m_MoveDir * Time.deltaTime);
             }
         }
diff --git a/unity/Assets/Scripts/DebugInputField.cs b/unity/Assets/Scripts/DebugInputField.cs
index 0eb115f664..0fc77e4c08 100644
--- a/unity/Assets/Scripts/DebugInputField.cs
+++ b/unity/Assets/Scripts/DebugInputField.cs
@@ -13,10 +13,8 @@
 using UnityEngine.AI;
 using UnityEngine.UI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class DebugInputField : MonoBehaviour
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class DebugInputField : MonoBehaviour {
         public GameObject Agent = null;
         public AgentManager AManager = null;
 
@@ -36,18 +34,15 @@ public class DebugInputField : MonoBehaviour
         };
 #endif
 
-        private bool setEnabledControlComponent(ControlMode mode, bool enabled)
-        {
+        private bool setEnabledControlComponent(ControlMode mode, bool enabled) {
             Type componentType;
             var success = PlayerControllers.controlModeToComponent.TryGetValue(
                 mode,
                 out componentType
             );
-            if (success)
-            {
+            if (success) {
                 var previousComponent = Agent.GetComponent(componentType) as MonoBehaviour;
-                if (previousComponent == null)
-                {
+                if (previousComponent == null) {
                     previousComponent = Agent.AddComponent(componentType) as MonoBehaviour;
                 }
                 previousComponent.enabled = enabled;
@@ -55,8 +50,7 @@ out componentType
             return success;
         }
 
-        public IEnumerator moveArmHeightDebug(float height)
-        {
+        public IEnumerator moveArmHeightDebug(float height) {
             CapsuleCollider cc = CurrentActiveController().GetComponent<CapsuleCollider>();
             var arm = CurrentActiveController().GetComponentInChildren<IK_Robot_Arm_Controller>();
             Vector3 cc_center = cc.center;
@@ -68,13 +62,11 @@ public IEnumerator moveArmHeightDebug(float height)
             Vector3 target = new Vector3(0, targetY, 0);
             float currentDistance = Vector3.SqrMagnitude(target - arm.transform.localPosition);
             double epsilon = 1e-3;
-            while (currentDistance > epsilon && !arm.collisionListener.ShouldHalt())
-            {
+            while (currentDistance > epsilon && !arm.collisionListener.ShouldHalt()) {
                 Vector3 direction = (target - arm.transform.localPosition).normalized;
                 arm.transform.localPosition += direction * 1.0f * Time.fixedDeltaTime;
 
-                if (!Physics.autoSimulation)
-                {
+                if (!Physics.autoSimulation) {
                     PhysicsSceneManager.PhysicsSimulateTHOR(Time.fixedDeltaTime);
                 }
 
@@ -84,8 +76,7 @@ public IEnumerator moveArmHeightDebug(float height)
             }
         }
 
-        public void dumpPosition(Transform to)
-        {
+        public void dumpPosition(Transform to) {
             Debug.Log("GameObject: " + to.gameObject.name);
             Debug.Log(
                 to.position.x.ToString("0.####")
@@ -97,8 +88,7 @@ public void dumpPosition(Transform to)
             );
         }
 
-        public IEnumerator moveArmDebug(Vector3 targetArmBase)
-        {
+        public IEnumerator moveArmDebug(Vector3 targetArmBase) {
             var arm = CurrentActiveController().GetComponentInChildren<IK_Robot_Arm_Controller>();
             // var rig = arm.transform.Find("FK_IK_rig").Find("robot_arm_IK_rig").GetComponent<UnityEngine.Animations.Rigging.Rig>();
             // var rigBuilder = arm.transform.Find("FK_IK_rig").Find("robot_arm_IK_rig").GetComponent<UnityEngine.Animations.Rigging.RigBuilder>();
@@ -114,8 +104,7 @@ public IEnumerator moveArmDebug(Vector3 targetArmBase)
             float currentDistance = Vector3.SqrMagnitude(target - armTarget.transform.position);
             double epsilon = 1e-3;
             Debug.Log("Starting arm movement");
-            while (currentDistance > epsilon && !arm.collisionListener.ShouldHalt())
-            {
+            while (currentDistance > epsilon && !arm.collisionListener.ShouldHalt()) {
                 Vector3 direction = (target - armTarget.transform.position).normalized;
                 armTarget.transform.position += direction * 1.0f * Time.fixedDeltaTime;
 
@@ -123,8 +112,7 @@ public IEnumerator moveArmDebug(Vector3 targetArmBase)
 
                 dumpPosition(wristCol);
 
-                if (!Physics.autoSimulation)
-                {
+                if (!Physics.autoSimulation) {
                     PhysicsSceneManager.PhysicsSimulateTHOR(Time.fixedDeltaTime);
                 }
                 // animator.Update(Time.fixedDeltaTime);
@@ -137,24 +125,21 @@ public IEnumerator moveArmDebug(Vector3 targetArmBase)
             Debug.Log("Ending arm movement");
         }
 
-        public void setControlMode(ControlMode mode)
-        {
+        public void setControlMode(ControlMode mode) {
             setEnabledControlComponent(controlMode, false);
             controlMode = mode;
             setEnabledControlComponent(controlMode, true);
         }
 
         // Use this for initialization
-        void Start()
-        {
+        void Start() {
 #if UNITY_EDITOR || UNITY_WEBGL
             Debug.Log("In Unity editor, init DebugInputField");
             this.InitializeUserControl();
 #endif
         }
 
-        void SelectPlayerControl()
-        {
+        void SelectPlayerControl() {
 #if UNITY_EDITOR
             Debug.Log("Player Control Set To: Editor control");
             setControlMode(ControlMode.DEBUG_TEXT_INPUT);
@@ -173,8 +158,7 @@ void SelectPlayerControl()
 #endif
         }
 
-        void InitializeUserControl()
-        {
+        void InitializeUserControl() {
             GameObject fpsController = GameObject.FindObjectOfType<BaseAgentComponent>().gameObject;
             Agent = fpsController.gameObject;
             AManager = GameObject
@@ -190,26 +174,20 @@ void InitializeUserControl()
 #endif
         }
 
-        BaseFPSAgentController CurrentActiveController()
-        {
+        BaseFPSAgentController CurrentActiveController() {
             return AManager.PrimaryAgent;
         }
 
-        private PhysicsRemoteFPSAgentController PhysicsController
-        {
+        private PhysicsRemoteFPSAgentController PhysicsController {
             get => (PhysicsRemoteFPSAgentController)this.CurrentActiveController();
         }
 
         // Update is called once per frame
-        void Update()
-        {
+        void Update() {
 #if UNITY_EDITOR
-            foreach (KeyValuePair<KeyCode, ControlMode> entry in debugKeyToController)
-            {
-                if (Input.GetKeyDown(entry.Key))
-                {
-                    if (controlMode != entry.Value)
-                    {
+            foreach (KeyValuePair<KeyCode, ControlMode> entry in debugKeyToController) {
+                if (Input.GetKeyDown(entry.Key)) {
+                    if (controlMode != entry.Value) {
                         // GameObject.Find("DebugCanvasPhysics").GetComponentInChildren<DebugInputField>().setControlMode(entry.Value);
                         setControlMode(entry.Value);
                         break;
@@ -220,11 +198,9 @@ void Update()
 #endif
         }
 
-        public void HideHUD()
-        {
+        public void HideHUD() {
             var InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
-            if (InputMode_Text != null)
-            {
+            if (InputMode_Text != null) {
                 InputMode_Text.SetActive(false);
             }
             var InputFieldObj = GameObject.Find("DebugCanvasPhysics/InputField");
@@ -235,19 +211,15 @@ public void HideHUD()
 
 #if UNITY_EDITOR
 
-        public string closestVisibleObjectId()
-        {
+        public string closestVisibleObjectId() {
             return (
                 (PhysicsRemoteFPSAgentController)AManager.PrimaryAgent
             ).ObjectIdOfClosestVisibleObject();
         }
 
-        public IEnumerator ExecuteBatch(List<string> commands)
-        {
-            foreach (var command in commands)
-            {
-                while (CurrentActiveController().IsProcessing)
-                {
+        public IEnumerator ExecuteBatch(List<string> commands) {
+            foreach (var command in commands) {
+                while (CurrentActiveController().IsProcessing) {
                     yield return new WaitForEndOfFrame();
                 }
                 Debug.Log("Executing Batch command: " + command);
@@ -256,17 +228,14 @@ public IEnumerator ExecuteBatch(List<string> commands)
         }
 
         // shortcut to execute no-parameter actions
-        private void ExecuteAction(string actionName)
-        {
+        private void ExecuteAction(string actionName) {
             Dictionary<string, object> action = new Dictionary<string, object>();
             action["action"] = actionName;
             AManager.ProcessControlCommand(new DynamicServerAction(action));
         }
 
-        public void Execute(string command)
-        {
-            if (CurrentActiveController().IsProcessing)
-            {
+        public void Execute(string command) {
+            if (CurrentActiveController().IsProcessing) {
                 Debug.Log("Cannot execute command while last action has not completed.");
             }
 
@@ -276,407 +245,370 @@ public void Execute(string command)
                 System.StringSplitOptions.None
             );
 
-            switch (splitcommand[0])
-            {
-                case "init":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    if (splitcommand.Length == 2)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                        action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    }
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderSemanticSegmentation = true;
-                    // action.renderInstanceSegmentation = true;
-                    // action.renderFlowImage = true;
-                    // action.rotateStepDegrees = 30;
-                    // action.ssao = "default";
-                    // action.snapToGrid = true;
-                    // action.makeAgentsVisible = false;
-                    // action.agentMode = "locobot";
-                    action["fieldOfView"] = 90f;
-                    // action.cameraY = 2.0f;
-
-                    action["snapToGrid"] = true;
-
-                    //action["width"] = 100;
-                    //action["height"] = 100;
-                    // action.rotateStepDegrees = 45;
-                    action["action"] = "Initialize";
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
-                    // Debug.Log("Physics scene manager = ...");
-                    // Debug.Log(physicsSceneManager);
-                    // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
-                    // Debug.Log(am);
-                    // am.Initialize(action);
-                    break;
-                }
-                case "initb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    // if (splitcommand.Length == 2) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    // } else if (splitcommand.Length == 3) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    //     action["agentCount"] = int.Parse(splitcommand[2]);
-                    // } else if (splitcommand.Length == 4) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    //     action["agentCount"] = int.Parse(splitcommand[2]);
-                    //     action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    // }
-
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderSemanticSegmentation = true;
-                    // action.renderInstanceSegmentation = true;
-                    // action.renderFlowImage = true;
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "locobot";
-                    // action["gridSize"] = 0.25f;
-                    action["visibilityDistance"] = 1.0f;
-                    action["rotateStepDegrees"] = 30;
-                    // action["agentControllerType"] = "stochastic";
-                    // action["applyActionNoise"] = true;
-                    action["width"] = 400;
-                    action["height"] = 300;
-                    action["snapToGrid"] = false;
-                    action["fieldOfView"] = 79;
-                    action["gridSize"] = 0.25f;
-
-                    action["applyActionNoise"] = true;
-                    action["continuousMode"] = true;
-                    //action["snapToGrid"] = false;
-                    //action["action"] = "Initialize";
-                    //action["fieldOfView"] = 90;
-                    //action["gridSize"] = 0.25f;
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    break;
-                }
-                case "initb1":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    // if (splitcommand.Length == 2) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    // } else if (splitcommand.Length == 3) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    //     action["agentCount"] = int.Parse(splitcommand[2]);
-                    // } else if (splitcommand.Length == 4) {
-                    //     action["gridSize"] = float.Parse(splitcommand[1]);
-                    //     action["agentCount"] = int.Parse(splitcommand[2]);
-                    //     action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    // }
-
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderSemanticSegmentation = true;
-                    // action.renderInstanceSegmentation = true;
-                    // action.renderFlowImage = true;
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "locobot";
-                    // action["gridSize"] = 0.25f;
-                    action["visibilityDistance"] = 1.5f;
-                    action["rotateStepDegrees"] = 30;
-                    // action["agentControllerType"] = "stochastic";
-                    // action["applyActionNoise"] = true;
-                    action["width"] = 400;
-                    action["height"] = 300;
-                    action["snapToGrid"] = false;
-                    action["fieldOfView"] = 90;
-                    action["gridSize"] = 0.25f;
-
-                    action["applyActionNoise"] = true;
-                    action["continuousMode"] = true;
-                    //action["snapToGrid"] = false;
-                    //action["action"] = "Initialize";
-                    //action["fieldOfView"] = 90;
-                    //action["gridSize"] = 0.25f;
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    break;
-                }
-                case "inita":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    if (splitcommand.Length == 2)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                        action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    }
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderClassImage = true;
-                    // action.renderObjectImage = true;
-                    // action.renderFlowImage = true;
-                    // PhysicsController.actionComplete = false;
-                    // action.rotateStepDegrees = 30;
-                    // action.ssao = "default";
-                    // action.snapToGrid = true;
-                    // action.makeAgentsVisible = false;
-                    // action.agentMode = "bot";
-                    // action.fieldOfView = 90f;
-                    // action.cameraY = 2.0f;
-                    // action.snapToGrid = true;
-                    // action.rotateStepDegrees = 45;
-                    action["action"] = "Initialize";
-
-                    action["agentMode"] = "arm";
-                    action["agentControllerType"] = "arm";
-                    action["renderInstanceSegmentation"] = true;
-
-                    // action.useMassThreshold = true;
-                    // action.massThreshold = 10f;
-
+            switch (splitcommand[0]) {
+                case "init": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        if (splitcommand.Length == 2) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                        } else if (splitcommand.Length == 3) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                            action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        }
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderSemanticSegmentation = true;
+                        // action.renderInstanceSegmentation = true;
+                        // action.renderFlowImage = true;
+                        // action.rotateStepDegrees = 30;
+                        // action.ssao = "default";
+                        // action.snapToGrid = true;
+                        // action.makeAgentsVisible = false;
+                        // action.agentMode = "locobot";
+                        action["fieldOfView"] = 90f;
+                        // action.cameraY = 2.0f;
+
+                        action["snapToGrid"] = true;
+
+                        //action["width"] = 100;
+                        //action["height"] = 100;
+                        // action.rotateStepDegrees = 45;
+                        action["action"] = "Initialize";
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
+                        // Debug.Log("Physics scene manager = ...");
+                        // Debug.Log(physicsSceneManager);
+                        // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
+                        // Debug.Log(am);
+                        // am.Initialize(action);
+                        break;
+                    }
+                case "initb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        // if (splitcommand.Length == 2) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        // } else if (splitcommand.Length == 3) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        //     action["agentCount"] = int.Parse(splitcommand[2]);
+                        // } else if (splitcommand.Length == 4) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        //     action["agentCount"] = int.Parse(splitcommand[2]);
+                        //     action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        // }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
-                    // Debug.Log("Physics scene manager = ...");
-                    // Debug.Log(physicsSceneManager);
-                    // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
-                    // Debug.Log(am);
-                    // am.Initialize(action);
-                    break;
-                }
-                case "initab":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    if (splitcommand.Length == 2)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                        action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    }
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderClassImage = true;
-                    // action.renderObjectImage = true;
-                    // action.renderFlowImage = true;
-                    // PhysicsController.actionComplete = false;
-                    // action.rotateStepDegrees = 30;
-                    // action.ssao = "default";
-                    // action.snapToGrid = true;
-                    // action.makeAgentsVisible = false;
-                    // action.agentMode = "bot";
-                    // action.fieldOfView = 90f;
-                    // action.cameraY = 2.0f;
-                    // action.snapToGrid = true;
-                    // action.rotateStepDegrees = 45;
-                    action["action"] = "Initialize";
-
-                    action["agentMode"] = "stretchab";
-                    // action["agentControllerType"] = "arm";
-                    action["renderInstanceSegmentation"] = true;
-
-                    // action.useMassThreshold = true;
-                    // action.massThreshold = 10f;
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderSemanticSegmentation = true;
+                        // action.renderInstanceSegmentation = true;
+                        // action.renderFlowImage = true;
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "locobot";
+                        // action["gridSize"] = 0.25f;
+                        action["visibilityDistance"] = 1.0f;
+                        action["rotateStepDegrees"] = 30;
+                        // action["agentControllerType"] = "stochastic";
+                        // action["applyActionNoise"] = true;
+                        action["width"] = 400;
+                        action["height"] = 300;
+                        action["snapToGrid"] = false;
+                        action["fieldOfView"] = 79;
+                        action["gridSize"] = 0.25f;
+
+                        action["applyActionNoise"] = true;
+                        action["continuousMode"] = true;
+                        //action["snapToGrid"] = false;
+                        //action["action"] = "Initialize";
+                        //action["fieldOfView"] = 90;
+                        //action["gridSize"] = 0.25f;
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
+                case "initb1": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        // if (splitcommand.Length == 2) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        // } else if (splitcommand.Length == 3) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        //     action["agentCount"] = int.Parse(splitcommand[2]);
+                        // } else if (splitcommand.Length == 4) {
+                        //     action["gridSize"] = float.Parse(splitcommand[1]);
+                        //     action["agentCount"] = int.Parse(splitcommand[2]);
+                        //     action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        // }
 
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderSemanticSegmentation = true;
+                        // action.renderInstanceSegmentation = true;
+                        // action.renderFlowImage = true;
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "locobot";
+                        // action["gridSize"] = 0.25f;
+                        action["visibilityDistance"] = 1.5f;
+                        action["rotateStepDegrees"] = 30;
+                        // action["agentControllerType"] = "stochastic";
+                        // action["applyActionNoise"] = true;
+                        action["width"] = 400;
+                        action["height"] = 300;
+                        action["snapToGrid"] = false;
+                        action["fieldOfView"] = 90;
+                        action["gridSize"] = 0.25f;
+
+                        action["applyActionNoise"] = true;
+                        action["continuousMode"] = true;
+                        //action["snapToGrid"] = false;
+                        //action["action"] = "Initialize";
+                        //action["fieldOfView"] = 90;
+                        //action["gridSize"] = 0.25f;
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
+                case "inita": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        if (splitcommand.Length == 2) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                        } else if (splitcommand.Length == 3) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                            action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        }
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderClassImage = true;
+                        // action.renderObjectImage = true;
+                        // action.renderFlowImage = true;
+                        // PhysicsController.actionComplete = false;
+                        // action.rotateStepDegrees = 30;
+                        // action.ssao = "default";
+                        // action.snapToGrid = true;
+                        // action.makeAgentsVisible = false;
+                        // action.agentMode = "bot";
+                        // action.fieldOfView = 90f;
+                        // action.cameraY = 2.0f;
+                        // action.snapToGrid = true;
+                        // action.rotateStepDegrees = 45;
+                        action["action"] = "Initialize";
+
+                        action["agentMode"] = "arm";
+                        action["agentControllerType"] = "arm";
+                        action["renderInstanceSegmentation"] = true;
+
+                        // action.useMassThreshold = true;
+                        // action.massThreshold = 10f;
+
+
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
+                        // Debug.Log("Physics scene manager = ...");
+                        // Debug.Log(physicsSceneManager);
+                        // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
+                        // Debug.Log(am);
+                        // am.Initialize(action);
+                        break;
+                    }
+                case "initab": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        if (splitcommand.Length == 2) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                        } else if (splitcommand.Length == 3) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                            action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        }
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderClassImage = true;
+                        // action.renderObjectImage = true;
+                        // action.renderFlowImage = true;
+                        // PhysicsController.actionComplete = false;
+                        // action.rotateStepDegrees = 30;
+                        // action.ssao = "default";
+                        // action.snapToGrid = true;
+                        // action.makeAgentsVisible = false;
+                        // action.agentMode = "bot";
+                        // action.fieldOfView = 90f;
+                        // action.cameraY = 2.0f;
+                        // action.snapToGrid = true;
+                        // action.rotateStepDegrees = 45;
+                        action["action"] = "Initialize";
+
+                        action["agentMode"] = "stretchab";
+                        // action["agentControllerType"] = "arm";
+                        action["renderInstanceSegmentation"] = true;
+
+                        // action.useMassThreshold = true;
+                        // action.massThreshold = 10f;
+
+
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
+                        // Debug.Log("Physics scene manager = ...");
+                        // Debug.Log(physicsSceneManager);
+                        // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
+                        // Debug.Log(am);
+                        // am.Initialize(action);
+                        break;
+                    }
+                case "initp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        if (splitcommand.Length == 2) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                        } else if (splitcommand.Length == 3) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                            action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    // AgentManager am = PhysicsController.gameObject.FindObjectsOfType<AgentManager>()[0];
-                    // Debug.Log("Physics scene manager = ...");
-                    // Debug.Log(physicsSceneManager);
-                    // AgentManager am = physicsSceneManager.GetComponent<AgentManager>();
-                    // Debug.Log(am);
-                    // am.Initialize(action);
-                    break;
-                }
-                case "initp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    if (splitcommand.Length == 2)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                        action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    }
-
-                    action["fieldOfView"] = 90f;
-                    action["snapToGrid"] = true;
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderSemanticSegmentation"] = true;
-                    action["action"] = "Initialize";
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    break;
-                }
-                case "initpsynth":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
-                    // by default the gridsize is 0.25, so only moving in increments of .25 will work
-                    // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
-                    // grid size!
-                    if (splitcommand.Length == 2)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["gridSize"] = float.Parse(splitcommand[1]);
-                        action["agentCount"] = int.Parse(splitcommand[2]);
-                        action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
-                    }
-                    action["renderNormalsImage"] = true;
-                    action["renderDepthImage"] = true;
-                    action["renderSemanticSegmentation"] = true;
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderFlowImage"] = true;
-
-                    action["fieldOfView"] = 90f;
-                    action["snapToGrid"] = true;
-                    action["action"] = "Initialize";
-                    action["procedural"] = true;
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        action["fieldOfView"] = 90f;
+                        action["snapToGrid"] = true;
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderSemanticSegmentation"] = true;
+                        action["action"] = "Initialize";
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        break;
+                    }
+                case "initpsynth": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // if you want to use smaller grid size step increments, initialize with a smaller/larger gridsize here
+                        // by default the gridsize is 0.25, so only moving in increments of .25 will work
+                        // so the MoveAhead action will only take, by default, 0.25, .5, .75 etc magnitude with the default
+                        // grid size!
+                        if (splitcommand.Length == 2) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                        } else if (splitcommand.Length == 3) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["gridSize"] = float.Parse(splitcommand[1]);
+                            action["agentCount"] = int.Parse(splitcommand[2]);
+                            action["makeAgentsVisible"] = int.Parse(splitcommand[3]) == 1;
+                        }
+                        action["renderNormalsImage"] = true;
+                        action["renderDepthImage"] = true;
+                        action["renderSemanticSegmentation"] = true;
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderFlowImage"] = true;
+
+                        action["fieldOfView"] = 90f;
+                        action["snapToGrid"] = true;
+                        action["action"] = "Initialize";
+                        action["procedural"] = true;
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
 
-                    break;
-                }
-                case "inite":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                        break;
+                    }
+                case "inite": {
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "Initialize" },
                         { "agentMode", "arm" },
                         { "agentControllerType", "mid-level" }
                     };
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
 
-                    var arm = CurrentActiveController()
-                        .GetComponentInChildren<IK_Robot_Arm_Controller>();
-                    var armTarget = GameObject.Find("IK_pos_rot_manipulator");
-                    armTarget.transform.Rotate(90f, 0f, 0f);
+                        var arm = CurrentActiveController()
+                            .GetComponentInChildren<IK_Robot_Arm_Controller>();
+                        var armTarget = GameObject.Find("IK_pos_rot_manipulator");
+                        armTarget.transform.Rotate(90f, 0f, 0f);
 
-                    var armJointToRotate = GameObject.Find("IK_pole_manipulator");
-                    armJointToRotate.transform.Rotate(0f, 0f, 90f);
-                    var armBase = GameObject.Find("robot_arm_rig_gripper");
-                    armBase.transform.Translate(0f, 0.27f, 0f);
+                        var armJointToRotate = GameObject.Find("IK_pole_manipulator");
+                        armJointToRotate.transform.Rotate(0f, 0f, 90f);
+                        var armBase = GameObject.Find("robot_arm_rig_gripper");
+                        armBase.transform.Translate(0f, 0.27f, 0f);
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(
-                            new Dictionary<string, object> { { "action", "LookDown" } }
-                        );
+                        CurrentActiveController()
+                            .ProcessControlCommand(
+                                new Dictionary<string, object> { { "action", "LookDown" } }
+                            );
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "sim":
-                {
-                    var collisionListener = this.CurrentActiveController()
-                        .GetComponent<CollisionListener>();
-                    Physics.Simulate(0.02f);
-                    var l = collisionListener.StaticCollisions();
-                    Debug.Log("total collisions: " + l.ToArray().Length);
-                    break;
-                }
+                case "sim": {
+                        var collisionListener = this.CurrentActiveController()
+                            .GetComponent<CollisionListener>();
+                        Physics.Simulate(0.02f);
+                        var l = collisionListener.StaticCollisions();
+                        Debug.Log("total collisions: " + l.ToArray().Length);
+                        break;
+                    }
 
-                case "inits":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "inits": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "stretch";
-                    action["agentControllerType"] = "stretch";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-                    //                  action["antiAliasing"] = "smaa";
-                    action["massThreshold"] = 10.0f;
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "stretch";
+                        action["agentControllerType"] = "stretch";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+                        //                  action["antiAliasing"] = "smaa";
+                        action["massThreshold"] = 10.0f;
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using stretch bot as source mesh
-                case "initpinnobody":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpinnobody": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         { "originOffsetX", 0.2f },
                         { "originOffsetZ", 0.4f },
                         { "colliderScaleRatio", new Vector3(0.8f, 1.2f, 0.5f) },
@@ -684,29 +616,28 @@ public void Execute(string command)
                         { "useAbsoluteSize", true }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using stretch bot as source mesh
-                case "initpins":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    //action["useAbsoluteSize"] = true;
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpins": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        //action["useAbsoluteSize"] = true;
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "StretchBotSimObj" }
@@ -717,28 +648,27 @@ public void Execute(string command)
                         { "useVisibleColliderBase", true }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initpinsabsolute":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    //action["useAbsoluteSize"] = true;
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpinsabsolute": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        //action["useAbsoluteSize"] = true;
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "StretchBotSimObj" }
@@ -750,28 +680,27 @@ public void Execute(string command)
                         { "useVisibleColliderBase", true }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
+
+                case "initpinsratio": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                case "initpinsratio":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    //action["useAbsoluteSize"] = true;
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        //action["useAbsoluteSize"] = true;
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "StretchBotSimObj" }
@@ -781,29 +710,28 @@ public void Execute(string command)
                         { "colliderScaleRatio", new Vector3(4, 3, 2) },
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using locobot as source mesh
-                case "initpinl":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    //action["useAbsoluteSize"] = true;
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpinl": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        //action["useAbsoluteSize"] = true;
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "LocoBotSimObj" }
@@ -813,30 +741,29 @@ public void Execute(string command)
                         { "colliderScaleRatio", new Vector3(1, 1, 1) }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using TOASTER!!! as source mesh
-                case "initpint":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    // AgentManager Initialize Args
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    // Fpin agent Initialize args
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpint": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        // AgentManager Initialize Args
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        // Fpin agent Initialize args
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "Toaster_5" }
@@ -846,32 +773,31 @@ public void Execute(string command)
                         { "colliderScaleRatio", new Vector3(1, 1, 1) },
                         { "useAbsoluteSize", false },
                     };
-                    //action["useAbsoluteSize"] = true;
+                        //action["useAbsoluteSize"] = true;
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using TOASTER!!! as source mesh
-                case "initpint321":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    // AgentManager Initialize Args
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    // Fpin agent Initialize args
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpint321": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        // AgentManager Initialize Args
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        // Fpin agent Initialize args
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "Toaster_5" }
@@ -882,32 +808,31 @@ public void Execute(string command)
                         { "useAbsoluteSize", false },
                         { "useVisibleColliderBase", false }
                     };
-                    //action["useAbsoluteSize"] = true;
+                        //action["useAbsoluteSize"] = true;
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using TOASTER!!! as source mesh
-                case "initpint321vcb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    // AgentManager Initialize Args
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
-
-                    // Fpin agent Initialize args
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpint321vcb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        // AgentManager Initialize Args
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
+
+                        // Fpin agent Initialize args
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "Toaster_5" }
@@ -918,245 +843,231 @@ public void Execute(string command)
                         { "useAbsoluteSize", false },
                         { "useVisibleColliderBase", true }
                     };
-                    //action["useAbsoluteSize"] = true;
+                        //action["useAbsoluteSize"] = true;
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
-                case "initpinobja":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    BodyAsset ba = null;
+                        break;
+                    }
+                case "initpinobja": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        BodyAsset ba = null;
 
-                    if (splitcommand.Length == 2)
-                    {
-                        var objectId = splitcommand[1];
+                        if (splitcommand.Length == 2) {
+                            var objectId = splitcommand[1];
 
-                        objectId = objectId.Trim();
-                        var pathSplit = Application.dataPath.Split('/');
+                            objectId = objectId.Trim();
+                            var pathSplit = Application.dataPath.Split('/');
 
-                        var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
-                        Debug.Log(string.Join("/", repoRoot));
+                            var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
+                            Debug.Log(string.Join("/", repoRoot));
 
-                        var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
-                        ba = new BodyAsset()
-                        {
-                            dynamicAsset = new LoadInUnityProceduralAsset()
-                            {
-                                id = objectId,
-                                dir = objaverseRoot
-                            }
-                        };
-                    }
+                            var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
+                            ba = new BodyAsset() {
+                                dynamicAsset = new LoadInUnityProceduralAsset() {
+                                    id = objectId,
+                                    dir = objaverseRoot
+                                }
+                            };
+                        }
 
-                    action["action"] = "Initialize";
-                    // AgentManager Initialize Args
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderDepth"] = true;
+                        action["action"] = "Initialize";
+                        // AgentManager Initialize Args
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderDepth"] = true;
 
-                    Debug.Log(
-                        $"--initpinobja id: {ba.dynamicAsset.id}, objadir: {ba.dynamicAsset.dir}"
-                    );
+                        Debug.Log(
+                            $"--initpinobja id: {ba.dynamicAsset.id}, objadir: {ba.dynamicAsset.dir}"
+                        );
 
-                    // Fpin agent Initialize args
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                        // Fpin agent Initialize args
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         { "bodyAsset", ba },
                         { "originOffsetX", 0.0f },
                         { "originOffsetZ", 0.0f },
                         { "colliderScaleRatio", new Vector3(1, 1, 1) }
                     };
-                    //action["useAbsoluteSize"] = true;
+                        //action["useAbsoluteSize"] = true;
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodynobody":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodynobody": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["colliderScaleRatio"] = new Vector3(1.2f, 1.3f, 1.4f);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    action["useAbsoluteSize"] = true;
-                    action["useVisibleColliderBase"] = true;
+                        action["action"] = "InitializeBody";
+                        action["colliderScaleRatio"] = new Vector3(1.2f, 1.3f, 1.4f);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        action["useAbsoluteSize"] = true;
+                        action["useVisibleColliderBase"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyt":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyt": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyorigint":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyorigint": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = 0.05f;
-                    action["originOffsetZ"] = 0.05f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = 0.05f;
+                        action["originOffsetZ"] = 0.05f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyratiot":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyratiot": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
-                    action["colliderScaleRatio"] = new Vector3(2f, 4f, 2f);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
+                        action["colliderScaleRatio"] = new Vector3(2f, 4f, 2f);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyabsolutet":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyabsolutet": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
-                    action["colliderScaleRatio"] = new Vector3(1f, 1f, 1f);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Toaster_5" };
+                        action["colliderScaleRatio"] = new Vector3(1f, 1f, 1f);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyl":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyl": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "LocoBotSimObj" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "LocoBotSimObj" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodys":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodys": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "StretchBotSimObj" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = -0.1f;
-                    action["originOffsetZ"] = 0.1157837f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "StretchBotSimObj" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = -0.1f;
+                        action["originOffsetZ"] = 0.1157837f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodya":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodya": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Apple_1" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Apple_1" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "initbodyc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "initbodyc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "InitializeBody";
-                    action["bodyAsset"] = new BodyAsset() { assetId = "Chair_227_1" };
-                    action["colliderScaleRatio"] = new Vector3(1, 1, 1);
-                    action["originOffsetX"] = 0.0f;
-                    action["originOffsetZ"] = 0.0f;
-                    //action["useAbsoluteSize"] = true;
+                        action["action"] = "InitializeBody";
+                        action["bodyAsset"] = new BodyAsset() { assetId = "Chair_227_1" };
+                        action["colliderScaleRatio"] = new Vector3(1, 1, 1);
+                        action["originOffsetX"] = 0.0f;
+                        action["originOffsetZ"] = 0.0f;
+                        //action["useAbsoluteSize"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //fpin using apple
-                case "initpina":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "fpin";
-                    action["visibilityScheme"] = "Distance";
-
-                    action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
-                        string,
-                        object
-                    >()
-                    {
+                case "initpina": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "fpin";
+                        action["visibilityScheme"] = "Distance";
+
+                        action[DynamicServerAction.agentInitializationParamsVariable] = new Dictionary<
+                            string,
+                            object
+                        >()
+                        {
                         {
                             "bodyAsset",
                             new BodyAsset() { assetId = "Apple_1" }
@@ -1166,23 +1077,22 @@ public void Execute(string command)
                         { "colliderScaleRatio", new Vector3(1, 1, 1) }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "inits-cp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "inits-cp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "stretch";
-                    action["agentControllerType"] = "stretch";
-                    action["renderInstanceSegmentation"] = true;
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "stretch";
+                        action["agentControllerType"] = "stretch";
+                        action["renderInstanceSegmentation"] = true;
 
-                    action["thirdPartyCameraParameters"] = new Dictionary<string, object>()
-                    {
+                        action["thirdPartyCameraParameters"] = new Dictionary<string, object>()
+                        {
                         {
                             "SecondaryCamera",
                             new CameraParameters()
@@ -1193,44 +1103,40 @@ public void Execute(string command)
                         }
                     };
 
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    break;
-                }
-                case "rpanm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        break;
+                    }
+                case "rpanm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "RandomlyPlaceAgentOnNavMesh";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "ftele":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "TeleportFull";
-                    action["position"] = new Vector3(10.0f, 0.009f, 2.75f);
-                    action["rotation"] = new Vector3(0f, 0f, 0f);
-                    action["horizon"] = -20f;
-                    action["standing"] = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "obig":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "PlaceObjectIntoGripper";
-                    action["objectId"] = "Apple|-00.47|+01.15|+00.48";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
+                        action["action"] = "RandomlyPlaceAgentOnNavMesh";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "ftele": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "TeleportFull";
+                        action["position"] = new Vector3(10.0f, 0.009f, 2.75f);
+                        action["rotation"] = new Vector3(0f, 0f, 0f);
+                        action["horizon"] = -20f;
+                        action["standing"] = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "obig": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action["action"] = "PlaceObjectIntoGripper";
+                        action["objectId"] = "Apple|-00.47|+01.15|+00.48";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
                 //                 case "telearm": {
                 //                        Dictionary<string, object> action = new Dictionary<string, object>();
                 //                        action["action"] = "TeleportArm";
@@ -1239,463 +1145,408 @@ public void Execute(string command)
                 //                        break;
                 //                }
 
-                case "mcb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "MoveCameraBase";
-                    action["xPositionOffset"] = 0;
-                    action["zPositionOffset"] = 0;
-                    if (splitcommand.Length > 1)
-                    {
-                        action["xPositionOffset"] = float.Parse(splitcommand[1]);
-                    }
-                    if (splitcommand.Length == 3)
-                    {
-                        action["zPositionOffset"] = float.Parse(splitcommand[2]);
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "mcb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                case "rcb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "RotateCameraBase";
-                    action["yawDegrees"] = 0;
-                    action["rollDegrees"] = 0;
-                    if (splitcommand.Length > 1)
-                    {
-                        action["yawDegrees"] = float.Parse(splitcommand[1]);
-                    }
-                    if (splitcommand.Length == 3)
-                    {
-                        action["rollDegrees"] = float.Parse(splitcommand[2]);
+                        action["action"] = "MoveCameraBase";
+                        action["xPositionOffset"] = 0;
+                        action["zPositionOffset"] = 0;
+                        if (splitcommand.Length > 1) {
+                            action["xPositionOffset"] = float.Parse(splitcommand[1]);
+                        }
+                        if (splitcommand.Length == 3) {
+                            action["zPositionOffset"] = float.Parse(splitcommand[2]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "rcm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "rcb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "RotateCameraMount";
-                    action["degrees"] = 20.0f;
-                    if (splitcommand.Length > 1)
-                    {
-                        action["degrees"] = float.Parse(splitcommand[1]);
-                    }
-                    if (splitcommand.Length == 3)
-                    {
-                        action["secondary"] = bool.Parse(splitcommand[2]);
+                        action["action"] = "RotateCameraBase";
+                        action["yawDegrees"] = 0;
+                        action["rollDegrees"] = 0;
+                        if (splitcommand.Length > 1) {
+                            action["yawDegrees"] = float.Parse(splitcommand[1]);
+                        }
+                        if (splitcommand.Length == 3) {
+                            action["rollDegrees"] = float.Parse(splitcommand[2]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "render":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "RenderObjectFromAngles";
-                    action["objectId"] = splitcommand[1];
-                    action["renderResolution"] = new Vector2(512, 512);
-                    action["angles"] = new List<float> { 0, 90, 180, 270 };
+                case "rcm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["cameraHeightMultiplier"] = 0.0f;
-                    if (splitcommand.Length > 2)
-                    {
-                        action["cameraHeightMultiplier"] = float.Parse(splitcommand[2]);
+                        action["action"] = "RotateCameraMount";
+                        action["degrees"] = 20.0f;
+                        if (splitcommand.Length > 1) {
+                            action["degrees"] = float.Parse(splitcommand[1]);
+                        }
+                        if (splitcommand.Length == 3) {
+                            action["secondary"] = bool.Parse(splitcommand[2]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "render": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action["action"] = "RenderObjectFromAngles";
+                        action["objectId"] = splitcommand[1];
+                        action["renderResolution"] = new Vector2(512, 512);
+                        action["angles"] = new List<float> { 0, 90, 180, 270 };
 
-                case "sgo":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["cameraHeightMultiplier"] = 0.0f;
+                        if (splitcommand.Length > 2) {
+                            action["cameraHeightMultiplier"] = float.Parse(splitcommand[2]);
+                        }
 
-                    action["action"] = "SetGripperOpenness";
-                    action["openness"] = 0;
-                    if (splitcommand.Length > 1)
-                    {
-                        action["openness"] = float.Parse(splitcommand[1]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "adbdol":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "sgo": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "SetAssetDatabaseCaching";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["enable"] = bool.Parse(splitcommand[1]);
+                        action["action"] = "SetGripperOpenness";
+                        action["openness"] = 0;
+                        if (splitcommand.Length > 1) {
+                            action["openness"] = float.Parse(splitcommand[1]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "mabd":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "adbdol": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "MoveArmBaseDown";
-                    action["distance"] = 0.4f;
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action["action"] = "SetAssetDatabaseCaching";
 
-                case "gaom":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        if (splitcommand.Length > 1) {
+                            action["enable"] = bool.Parse(splitcommand[1]);
+                        }
 
-                    action["action"] = "GetApproxObjectMask";
-                    action["objectId"] = splitcommand[1];
-                    if (splitcommand.Length > 2)
-                    {
-                        action["divisions"] = int.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "mabd": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                case "inits-camera":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseDown";
+                        action["distance"] = 0.4f;
 
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "stretch";
-                    action["agentControllerType"] = "stretch";
-                    action["renderInstanceSegmentation"] = true;
-                    action["cameraNearPlane"] = 0.05f;
-                    if (splitcommand.Length >= 2)
-                    {
-                        action["cameraNearPlane"] = float.Parse(splitcommand[1]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action["cameraFarPlane"] = 20.0f;
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                case "gaom": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    break;
-                }
+                        action["action"] = "GetApproxObjectMask";
+                        action["objectId"] = splitcommand[1];
+                        if (splitcommand.Length > 2) {
+                            action["divisions"] = int.Parse(splitcommand[2]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getlights":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "inits-camera": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "GetLights";
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "stretch";
+                        action["agentControllerType"] = "stretch";
+                        action["renderInstanceSegmentation"] = true;
+                        action["cameraNearPlane"] = 0.05f;
+                        if (splitcommand.Length >= 2) {
+                            action["cameraNearPlane"] = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        action["cameraFarPlane"] = 20.0f;
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                    //ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
 
-                    break;
-                }
+                case "getlights": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                case "stretchtest1":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_1");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                        action["action"] = "GetLights";
 
-                case "stretchtest2":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_2");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                case "stretchtest3":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_3");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                        //ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        //CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action), AManager);
 
-                case "stretchtest4":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_4");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                        break;
+                    }
 
-                case "stretchtest5":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_5");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest1": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_1");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest6":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_6");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest2": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_2");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest7":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_7");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest3": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_3");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest8":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_8");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest4": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_4");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest9":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_9");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest5": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_5");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest10":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_10");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest6": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_6");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest11":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_11");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest7": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_7");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest12":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_12");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest8": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_8");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest13":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_13");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest9": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_9");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest14":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_14");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest10": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_10");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest15":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_15");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest11": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_11");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest16":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_16");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest12": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_12");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest17":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_17");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest13": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_13");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtest18":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_18");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest14": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_14");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtestu":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_u");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest15": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_15");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "stretchtestd":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_stretch_arm_d");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest16": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_16");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "iktest1":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_ik_arm_1");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest17": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_17");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "iktest2":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("run move_ik_arm_2");
-                    //commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "stretchtest18": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_18");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+
+                case "stretchtestu": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_u");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+
+                case "stretchtestd": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_stretch_arm_d");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+
+                case "iktest1": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_ik_arm_1");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "parent":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                case "iktest2": {
+                        List<string> commands = new List<string>();
+                        commands.Add("run move_ik_arm_2");
+                        //commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+
+                case "parent": {
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "ParentObject" },
                     };
-                    action["parentId"] = splitcommand[1];
-                    action["childId"] = splitcommand[2];
+                        action["parentId"] = splitcommand[1];
+                        action["childId"] = splitcommand[2];
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "gohfr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                case "gohfr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "GetObjectHitFromRaycast" },
                         { "from", new Vector3(1.048016f, 1f, 9.798f) },
                         { "to", new Vector3(1.048016f, 0f, 9.798f) }
                     };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "bboxdist":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                case "bboxdist": {
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "BBoxDistance" },
                         { "objectId0", splitcommand[1] },
                         { "objectId1", splitcommand[2] }
                     };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "adjacent":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                case "adjacent": {
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "CheckUnobstructedPathBetweenObjectCenters" },
                         { "objectId0", splitcommand[1] },
                         { "objectId1", splitcommand[2] }
                     };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "whaton":
-                {
-                    List<string> objectIds = new List<string>();
+                case "whaton": {
+                        List<string> objectIds = new List<string>();
 
-                    for (int i = 1; i < splitcommand.Length; i++)
-                    {
-                        objectIds.Add(splitcommand[i]);
-                    }
-                    Dictionary<string, object> action = new Dictionary<string, object>
-                    {
+                        for (int i = 1; i < splitcommand.Length; i++) {
+                            objectIds.Add(splitcommand[i]);
+                        }
+                        Dictionary<string, object> action = new Dictionary<string, object>
+                        {
                         { "action", "CheckWhatObjectsOn" },
                         { "objectIds", objectIds },
                     };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "expspawn":
-                {
-                    ServerAction action = new ServerAction();
+                case "expspawn": {
+                        ServerAction action = new ServerAction();
 
-                    if (splitcommand.Length == 2)
-                    {
-                        if (splitcommand[1] == "s")
-                        {
-                            action.objectType = "screen";
-                        }
+                        if (splitcommand.Length == 2) {
+                            if (splitcommand[1] == "s") {
+                                action.objectType = "screen";
+                            }
 
-                        if (splitcommand[1] == "r")
-                        {
+                            if (splitcommand[1] == "r") {
+                                action.objectType = "receptacle";
+                            }
+                        } else {
                             action.objectType = "receptacle";
                         }
+                        action.action = "ReturnValidSpawnsExpRoom";
+                        action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
+                        action.objectVariation = 0;
+                        action.y = 120f; // UnityEngine.Random.Range(0, 360);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        action.objectType = "receptacle";
-                    }
-                    action.action = "ReturnValidSpawnsExpRoom";
-                    action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
-                    action.objectVariation = 0;
-                    action.y = 120f; // UnityEngine.Random.Range(0, 360);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // Reads and executes each action from a JSON file.
                 // Example: 'run', where a local file explorer will open, and you'll select a json file.
@@ -1706,27 +1557,21 @@ public void Execute(string command)
                     const string BASE_PATH = "./debug/";
                     string file = "";
                     string path;
-                    if (splitcommand.Length == 1)
-                    {
+                    if (splitcommand.Length == 1) {
                         // opens up a file explorer in the background
                         path = EditorUtility.OpenFilePanel(
                             title: "Open JSON actions file.",
                             directory: "debug",
                             extension: "json"
                         );
-                    }
-                    else if (splitcommand.Length == 2)
-                    {
+                    } else if (splitcommand.Length == 2) {
                         // uses ./debug/{splitcommand[1]}[.json]
                         file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
+                        if (!file.EndsWith(".json")) {
                             file += ".json";
                         }
                         path = BASE_PATH + file;
-                    }
-                    else
-                    {
+                    } else {
                         Debug.LogError(
                             "Pass in a file name, like 'run simple' or open a file with 'run'."
                         );
@@ -1739,29 +1584,22 @@ public void Execute(string command)
                     Debug.Log($"Running: {file}.json. It has {actions.Count} total actions.");
 
                     // execute each action
-                    IEnumerator executeBatch(JArray jActions)
-                    {
+                    IEnumerator executeBatch(JArray jActions) {
                         int i = 0;
-                        foreach (JObject action in jActions)
-                        {
-                            if (!action.ContainsKey("action"))
-                            {
+                        foreach (JObject action in jActions) {
+                            if (!action.ContainsKey("action")) {
                                 continue;
                             }
-                            while (CurrentActiveController().IsProcessing)
-                            {
+                            while (CurrentActiveController().IsProcessing) {
                                 yield return new WaitForEndOfFrame();
                             }
                             Debug.Log($"{++i} Executing: {action}");
-                            if (AManager.agentManagerActions.Contains((String)action["action"]))
-                            {
+                            if (AManager.agentManagerActions.Contains((String)action["action"])) {
                                 ActionDispatcher.Dispatch(
                                     AManager,
                                     new DynamicServerAction(action)
                                 );
-                            }
-                            else
-                            {
+                            } else {
                                 CurrentActiveController()
                                     .ProcessControlCommand(new DynamicServerAction(action));
                             }
@@ -1769,525 +1607,463 @@ IEnumerator executeBatch(JArray jActions)
                     }
                     StartCoroutine(executeBatch(jActions: actions));
                     break;
-                case "cwr":
-                {
-                    CurrentActiveController().SimObjPhysicsTypeIsReceptacle();
-                    var obj = CurrentActiveController().actionReturn;
-                    var jsonResolver = new ShouldSerializeContractResolver();
-                    var str = Newtonsoft.Json.JsonConvert.SerializeObject(
-                        obj,
-                        Newtonsoft.Json.Formatting.None,
-                        new Newtonsoft.Json.JsonSerializerSettings()
-                        {
-                            ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
-                            ContractResolver = jsonResolver
-                        }
-                    );
-                    Debug.Log(str);
-
-                    break;
-                }
-                case "exp":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "SpawnExperimentObjAtRandom";
-                    action.objectType = "receptacle";
-                    action.randomSeed = 50; // UnityEngine.Random.Range(0, 1000);
-                    action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
-                    action.objectVariation = 12;
-                    action.y = 120f; // UnityEngine.Random.Range(0, 360);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "exps":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "SpawnExperimentObjAtRandom";
-                    action.objectType = "screen";
-                    action.randomSeed = UnityEngine.Random.Range(0, 1000);
-                    action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
+                case "cwr": {
+                        CurrentActiveController().SimObjPhysicsTypeIsReceptacle();
+                        var obj = CurrentActiveController().actionReturn;
+                        var jsonResolver = new ShouldSerializeContractResolver();
+                        var str = Newtonsoft.Json.JsonConvert.SerializeObject(
+                            obj,
+                            Newtonsoft.Json.Formatting.None,
+                            new Newtonsoft.Json.JsonSerializerSettings() {
+                                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
+                                ContractResolver = jsonResolver
+                            }
+                        );
+                        Debug.Log(str);
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action.objectVariation = int.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.objectVariation = 0;
+                        break;
                     }
-                    action.y = 0f; // UnityEngine.Random.Range(0, 360);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "expp":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "SpawnExperimentObjAtPoint";
-                    action.objectType = "replacement"; //"receptacle";
-                    action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
-                    action.objectVariation = 12;
-                    action.position = new Vector3(-1.4f, 0.9f, 0.1f);
-                    action.y = 120f; // UnityEngine.Random.Range(0, 360);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "wallcolor":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "ChangeWallColorExpRoom";
-                    action.r = 100f;
-                    action.g = 100f;
-                    action.b = 100f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "floorcolor":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "ChangeFloorColorExpRoom";
-                    action.r = 100f;
-                    action.g = 100f;
-                    action.b = 100f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "wallmaterial":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ChangeWallMaterialExpRoom";
-                    action["objectVariation"] = 1;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "floormaterial":
-                {
-                    ServerAction action = new ServerAction();
+                case "exp": {
+                        ServerAction action = new ServerAction();
 
-                    action.action = "ChangeFloorMaterialExpRoom";
-                    action.objectVariation = 1;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "SpawnExperimentObjAtRandom";
+                        action.objectType = "receptacle";
+                        action.randomSeed = 50; // UnityEngine.Random.Range(0, 1000);
+                        action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
+                        action.objectVariation = 12;
+                        action.y = 120f; // UnityEngine.Random.Range(0, 360);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "lightc":
-                {
-                    ServerAction action = new ServerAction();
+                case "exps": {
+                        ServerAction action = new ServerAction();
 
-                    action.action = "ChangeLightColorExpRoom";
-                    action.r = 20f;
-                    action.g = 94f;
-                    action.b = 10f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "SpawnExperimentObjAtRandom";
+                        action.objectType = "screen";
+                        action.randomSeed = UnityEngine.Random.Range(0, 1000);
+                        action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
 
-                case "lighti":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ChangeLightIntensityExpRoom";
-                    action["intensity"] = 3;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        if (splitcommand.Length == 2) {
+                            action.objectVariation = int.Parse(splitcommand[1]);
+                        } else {
+                            action.objectVariation = 0;
+                        }
+                        action.y = 0f; // UnityEngine.Random.Range(0, 360);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "tabletopc":
-                {
-                    ServerAction action = new ServerAction();
+                case "expp": {
+                        ServerAction action = new ServerAction();
 
-                    action.action = "ChangeTableTopColorExpRoom";
-                    action.r = 20f;
-                    action.g = 94f;
-                    action.b = 10f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "SpawnExperimentObjAtPoint";
+                        action.objectType = "replacement"; //"receptacle";
+                        action.receptacleObjectId = "DiningTable|-00.59|+00.00|+00.33";
+                        action.objectVariation = 12;
+                        action.position = new Vector3(-1.4f, 0.9f, 0.1f);
+                        action.y = 120f; // UnityEngine.Random.Range(0, 360);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "tabletopm":
-                {
-                    ServerAction action = new ServerAction();
+                case "wallcolor": {
+                        ServerAction action = new ServerAction();
 
-                    action.action = "ChangeTableTopMaterialExpRoom";
-                    action.objectVariation = 3;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "ChangeWallColorExpRoom";
+                        action.r = 100f;
+                        action.g = 100f;
+                        action.b = 100f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "tablelegc":
-                {
-                    ServerAction action = new ServerAction();
+                case "floorcolor": {
+                        ServerAction action = new ServerAction();
 
-                    action.action = "ChangeTableLegColorExpRoom";
-                    action.r = 20f;
-                    action.g = 94f;
-                    action.b = 10f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "ChangeFloorColorExpRoom";
+                        action.r = 100f;
+                        action.g = 100f;
+                        action.b = 100f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "tablelegm":
-                {
-                    ServerAction action = new ServerAction();
+                case "wallmaterial": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ChangeWallMaterialExpRoom";
+                        action["objectVariation"] = 1;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    action.action = "ChangeTableLegMaterialExpRoom";
-                    action.objectVariation = 3;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "floormaterial": {
+                        ServerAction action = new ServerAction();
 
-                case "screenm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ChangeScreenMaterialExpRoom";
-                    action["objectVariation"] = 3;
-                    action["objectId"] = "ScreenSheet|-00.18|+01.24|+00.23";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "ChangeFloorMaterialExpRoom";
+                        action.objectVariation = 1;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "screenc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ChangeScreenColorExpRoom";
-                    action["r"] = 20f;
-                    action["g"] = 94f;
-                    action["b"] = 10f;
-                    action["objectId"] = "ScreenSheet|-00.18|+01.24|+00.23";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "lightc": {
+                        ServerAction action = new ServerAction();
 
-                case "grid":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetReceptacleCoordinatesExpRoom";
-                    action["gridSize"] = 0.1f;
-                    action["maxStepCount"] = 5;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.action = "ChangeLightColorExpRoom";
+                        action.r = 20f;
+                        action.g = 94f;
+                        action.b = 10f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "dirtcoords":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetDirtCoordinateBounds";
+                case "lighti": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ChangeLightIntensityExpRoom";
+                        action["intensity"] = 3;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+                case "tabletopc": {
+                        ServerAction action = new ServerAction();
 
-                    if (table == null)
-                    {
+                        action.action = "ChangeTableTopColorExpRoom";
+                        action.r = 20f;
+                        action.g = 94f;
+                        action.b = 10f;
+                        CurrentActiveController().ProcessControlCommand(action);
                         break;
                     }
 
-                    action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "tabletopm": {
+                        ServerAction action = new ServerAction();
 
-                case "spawndirt":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SpawnDirt";
+                        action.action = "ChangeTableTopMaterialExpRoom";
+                        action.objectVariation = 3;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+                case "tablelegc": {
+                        ServerAction action = new ServerAction();
 
-                    if (table == null)
-                    {
+                        action.action = "ChangeTableLegColorExpRoom";
+                        action.r = 20f;
+                        action.g = 94f;
+                        action.b = 10f;
+                        CurrentActiveController().ProcessControlCommand(action);
                         break;
                     }
 
-                    action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
-                    action["howManyDirt"] = 100;
-                    action["randomSeed"] = 0;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "spawndirtarray":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SpawnDirt";
+                case "tablelegm": {
+                        ServerAction action = new ServerAction();
 
-                    GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+                        action.action = "ChangeTableLegMaterialExpRoom";
+                        action.objectVariation = 3;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    if (table == null)
-                    {
+                case "screenm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ChangeScreenMaterialExpRoom";
+                        action["objectVariation"] = 3;
+                        action["objectId"] = "ScreenSheet|-00.18|+01.24|+00.23";
+                        CurrentActiveController().ProcessControlCommand(action);
                         break;
                     }
 
-                    action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
-                    action["spawnPositions"] = new DirtSpawnPosition[]
-                    {
+                case "screenc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ChangeScreenColorExpRoom";
+                        action["r"] = 20f;
+                        action["g"] = 94f;
+                        action["b"] = 10f;
+                        action["objectId"] = "ScreenSheet|-00.18|+01.24|+00.23";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+
+                case "grid": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetReceptacleCoordinatesExpRoom";
+                        action["gridSize"] = 0.1f;
+                        action["maxStepCount"] = 5;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+
+                case "dirtcoords": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetDirtCoordinateBounds";
+
+                        GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+
+                        if (table == null) {
+                            break;
+                        }
+
+                        action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+
+                case "spawndirt": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SpawnDirt";
+
+                        GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+
+                        if (table == null) {
+                            break;
+                        }
+
+                        action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
+                        action["howManyDirt"] = 100;
+                        action["randomSeed"] = 0;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+
+                case "spawndirtarray": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SpawnDirt";
+
+                        GameObject table = GameObject.FindObjectOfType<DirtAndWrite>().gameObject;
+
+                        if (table == null) {
+                            break;
+                        }
+
+                        action["objectId"] = table.GetComponent<SimObjPhysics>().objectID;
+                        action["spawnPositions"] = new DirtSpawnPosition[]
+                        {
                         new DirtSpawnPosition() { x = -1.728f, z = -0.918f },
                         new DirtSpawnPosition() { x = 1.728f, z = 0.918f }
-                    };
-                    action["randomSeed"] = 0;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        };
+                        action["randomSeed"] = 0;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "cleardirt":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ClearAllDirt";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "cleardirt": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ClearAllDirt";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sponge":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ActivateSponge";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sponge": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ActivateSponge";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getsponge":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetSpongeScale";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "setsponge":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetSpongeScale";
-                    action["x"] = 3.0f;
-                    action["y"] = 3.0f;
-                    action["z"] = 3.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getsponge": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetSpongeScale";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "setsponge": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetSpongeScale";
+                        action["x"] = 3.0f;
+                        action["y"] = 3.0f;
+                        action["z"] = 3.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "pen":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ActivatePen";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "pen": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ActivatePen";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getspongemeta":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetSpongeMeta";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getspongemeta": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetSpongeMeta";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getpenmeta":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetPenMeta";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getpenmeta": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetPenMeta";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getdirtmeta":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetDirtMeta";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getdirtmeta": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetDirtMeta";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getdoorhinge":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetDoorHinge";
-                    action["objectId"] = "door|1|3";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getdoorhinge": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetDoorHinge";
+                        action["objectId"] = "door|1|3";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getdoorhandle":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetDoorHandle";
-                    action["objectId"] = "door|1|3";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getdoorhandle": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetDoorHandle";
+                        action["objectId"] = "door|1|3";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "getpenmarkmeta":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetPenMarkMeta";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "getpenmarkmeta": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetPenMarkMeta";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // initialize drone mode
-                case "initd":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    // action.renderNormalsImage = true;
-                    // action.renderDepthImage = true;
-                    // action.renderSemanticSegmentation = true;
-                    // action.renderInstanceSegmentation = true;
-                    // action.renderFlowImage = true;
-
-                    action["action"] = "Initialize";
-                    action["agentMode"] = "drone";
-                    action["agentControllerType"] = "drone";
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                case "initd": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        // action.renderNormalsImage = true;
+                        // action.renderDepthImage = true;
+                        // action.renderSemanticSegmentation = true;
+                        // action.renderInstanceSegmentation = true;
+                        // action.renderFlowImage = true;
+
+                        action["action"] = "Initialize";
+                        action["agentMode"] = "drone";
+                        action["agentControllerType"] = "drone";
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
 
-                    break;
-                }
+                        break;
+                    }
 
                 // activate cracked camera effect with random seed
-                case "cc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "CameraCrack";
-
-                    // give me a seed
-                    if (splitcommand.Length == 2)
-                    {
-                        action["randomSeed"] = int.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["randomSeed"] = 0;
-                    }
+                case "cc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "CameraCrack";
+
+                        // give me a seed
+                        if (splitcommand.Length == 2) {
+                            action["randomSeed"] = int.Parse(splitcommand[1]);
+                        } else {
+                            action["randomSeed"] = 0;
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "geo":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "GetInSceneAssetGeometry",
-                        ["objectId"] = splitcommand[1],
-                        ["triangles"] = true
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "geo": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "GetInSceneAssetGeometry",
+                            ["objectId"] = splitcommand[1],
+                            ["triangles"] = true
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "des":
-                {
-                    var action = new Dictionary<string, object>() { ["action"] = "DestroyHouse" };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "des": {
+                        var action = new Dictionary<string, object>() { ["action"] = "DestroyHouse" };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move ahead stochastic
-                case "mas":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveAhead";
+                case "mas": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveAhead";
 
-                    action.moveMagnitude = 0.25f;
+                        action.moveMagnitude = 0.25f;
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
-                case "rad":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetAgentRadius";
-                    action["agentRadius"] = 0.35f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        break;
+                    }
+                case "rad": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetAgentRadius";
+                        action["agentRadius"] = 0.35f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbc":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(1.0f, 1.0f, 1.0f),
-                        ["useVisibleColliderBase"] = false
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbc": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(1.0f, 1.0f, 1.0f),
+                            ["useVisibleColliderBase"] = false
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbc2":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(1.1f, 1.0f, 1.3f),
-                        ["useVisibleColliderBase"] = false
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbc2": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(1.1f, 1.0f, 1.3f),
+                            ["useVisibleColliderBase"] = false
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbcv":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(1.3f, 1.0f, 1.0f),
-                        ["useVisibleColliderBase"] = true
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbcv": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(1.3f, 1.0f, 1.0f),
+                            ["useVisibleColliderBase"] = true
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbcv2":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(1.0f, 1.0f, 1.3f),
-                        ["useVisibleColliderBase"] = true
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbcv2": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(1.0f, 1.0f, 1.3f),
+                            ["useVisibleColliderBase"] = true
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbca":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(0.5f, 1.0f, 0.3f),
-                        ["useAbsoluteSize"] = true
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbca": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(0.5f, 1.0f, 0.3f),
+                            ["useAbsoluteSize"] = true
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "sbca2":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateAgentBoxCollider",
-                        ["colliderScaleRatio"] = new Vector3(0.3f, 1.0f, 0.5f),
-                        ["useAbsoluteSize"] = true
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sbca2": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateAgentBoxCollider",
+                            ["colliderScaleRatio"] = new Vector3(0.3f, 1.0f, 0.5f),
+                            ["useAbsoluteSize"] = true
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "dbc":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "DestroyAgentBoxCollider",
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "dbc": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "DestroyAgentBoxCollider",
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // This is dangerous because it will modify the underlying
                 // materials, and you'll have to call "git restore *.mat *maT"
@@ -2317,15 +2093,13 @@ IEnumerator executeBatch(JArray jActions)
                 case "dangerouslyChangeMaterial":
                     List<string> excludedObjectIds = new List<string>();
 
-                    if (splitcommand.Length > 1)
-                    {
+                    if (splitcommand.Length > 1) {
                         excludedObjectIds.Add(splitcommand[1]);
                     }
 
                     CurrentActiveController()
                         .ProcessControlCommand(
-                            new Dictionary<string, object>()
-                            {
+                            new Dictionary<string, object>() {
                                 ["action"] = "RandomizeMaterials",
                                 ["excludedObjectIds"] = excludedObjectIds
                             }
@@ -2338,4247 +2112,3717 @@ IEnumerator executeBatch(JArray jActions)
                         );
                     break;
 
-                case "light":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "RandomizeLighting",
-                        ["synchronized"] = false,
-                        ["brightness"] = new float[] { 0.5f, 1.5f },
-                        ["hue"] = new float[] { 0, 1 },
-                        ["saturation"] = new float[] { 0, 1 }
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "light": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "RandomizeLighting",
+                            ["synchronized"] = false,
+                            ["brightness"] = new float[] { 0.5f, 1.5f },
+                            ["hue"] = new float[] { 0, 1 },
+                            ["saturation"] = new float[] { 0, 1 }
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "resetlight":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "ResetLighting"
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "resetlight": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "ResetLighting"
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "spawnabove":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "GetSpawnCoordinatesAboveReceptacle";
-                    action.objectId = "CounterTop|-01.94|+00.98|-03.67";
-                    action.anywhere = false;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "spawnabove": {
+                        ServerAction action = new ServerAction();
+                        action.action = "GetSpawnCoordinatesAboveReceptacle";
+                        action.objectId = "CounterTop|-01.94|+00.98|-03.67";
+                        action.anywhere = false;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "crazydiamond":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MakeObjectsOfTypeUnbreakable";
-                    action["objectType"] = "Egg";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "crazydiamond": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MakeObjectsOfTypeUnbreakable";
+                        action["objectType"] = "Egg";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "stc":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SpawnTargetCircle";
-                    if (splitcommand.Length > 1)
-                    {
-                        if (int.Parse(splitcommand[1]) == 0)
-                        {
-                            action.objectVariation = 0;
-                        }
+                case "stc": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SpawnTargetCircle";
+                        if (splitcommand.Length > 1) {
+                            if (int.Parse(splitcommand[1]) == 0) {
+                                action.objectVariation = 0;
+                            }
 
-                        if (int.Parse(splitcommand[1]) == 1)
-                        {
-                            action.objectVariation = 1;
-                        }
+                            if (int.Parse(splitcommand[1]) == 1) {
+                                action.objectVariation = 1;
+                            }
 
-                        if (int.Parse(splitcommand[1]) == 2)
-                        {
-                            action.objectVariation = 2;
+                            if (int.Parse(splitcommand[1]) == 2) {
+                                action.objectVariation = 2;
+                            }
                         }
-                    }
 
-                    action.anywhere = false; // false, only recepatcle objects in viewport used
-                    // action.minDistance = 1.8f;
-                    // action.maxDistance = 2.5f;
-                    // action.objectId = "Floor|+00.00|+00.00|+00.00";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action.anywhere = false; // false, only recepatcle objects in viewport used
+                                                 // action.minDistance = 1.8f;
+                                                 // action.maxDistance = 2.5f;
+                                                 // action.objectId = "Floor|+00.00|+00.00|+00.00";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "smp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetMassProperties";
-                    action["objectId"] = "Pot|+00.30|+00.96|+01.35";
-                    action["mass"] = 100;
-                    action["drag"] = 100;
-                    action["angularDrag"] = 100;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "smp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetMassProperties";
+                        action["objectId"] = "Pot|+00.30|+00.96|+01.35";
+                        action["mass"] = 100;
+                        action["drag"] = 100;
+                        action["angularDrag"] = 100;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "pp":
-                {
-                    ExecuteAction("PausePhysicsAutoSim");
-                    break;
-                }
+                case "pp": {
+                        ExecuteAction("PausePhysicsAutoSim");
+                        break;
+                    }
 
-                case "msa":
-                {
-                    GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                    go.transform.position = new Vector3(-0.771f, 0.993f, 0.8023f);
-                    go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
-                    SphereCollider sc = go.GetComponent<SphereCollider>();
-                    sc.isTrigger = true;
-                    break;
-                }
-                case "msr":
-                {
-                    GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                    go.transform.position = new Vector3(-0.771f, 0.87f, 0.6436f);
-                    go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
-                    SphereCollider sc = go.GetComponent<SphereCollider>();
-                    sc.isTrigger = true;
-                    break;
-                }
+                case "msa": {
+                        GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                        go.transform.position = new Vector3(-0.771f, 0.993f, 0.8023f);
+                        go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+                        SphereCollider sc = go.GetComponent<SphereCollider>();
+                        sc.isTrigger = true;
+                        break;
+                    }
+                case "msr": {
+                        GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                        go.transform.position = new Vector3(-0.771f, 0.87f, 0.6436f);
+                        go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+                        SphereCollider sc = go.GetComponent<SphereCollider>();
+                        sc.isTrigger = true;
+                        break;
+                    }
 
-                case "mach":
-                {
-                    var moveCall = moveArmHeightDebug(0.4f);
-                    StartCoroutine(moveCall);
-                    break;
-                }
+                case "mach": {
+                        var moveCall = moveArmHeightDebug(0.4f);
+                        StartCoroutine(moveCall);
+                        break;
+                    }
 
-                case "mafh":
-                {
-                    var moveCall = moveArmHeightDebug(0.4f);
-                    while (moveCall.MoveNext())
-                    {
-                        // physics simulate happens in  updateTransformPropertyFixedUpdate as long
-                        // as autoSimulation is off
+                case "mafh": {
+                        var moveCall = moveArmHeightDebug(0.4f);
+                        while (moveCall.MoveNext()) {
+                            // physics simulate happens in  updateTransformPropertyFixedUpdate as long
+                            // as autoSimulation is off
+                        }
+                        break;
                     }
-                    break;
-                }
-                case "macr":
-                {
-                    var target = new Vector3(0.1f, 0.0f, 0.4f);
-                    var moveCall = moveArmDebug(target);
-                    StartCoroutine(moveCall);
-                    break;
-                }
-                case "mafr":
-                {
-                    var target = new Vector3(0.1f, 0.0f, 0.4f);
-                    var moveCall = moveArmDebug(target);
-                    while (moveCall.MoveNext())
-                    {
-                        // physics simulate happens in  updateTransformPropertyFixedUpdate as long
-                        // as autoSimulation is off
+                case "macr": {
+                        var target = new Vector3(0.1f, 0.0f, 0.4f);
+                        var moveCall = moveArmDebug(target);
+                        StartCoroutine(moveCall);
+                        break;
                     }
+                case "mafr": {
+                        var target = new Vector3(0.1f, 0.0f, 0.4f);
+                        var moveCall = moveArmDebug(target);
+                        while (moveCall.MoveNext()) {
+                            // physics simulate happens in  updateTransformPropertyFixedUpdate as long
+                            // as autoSimulation is off
+                        }
 
-                    break;
-                }
-                case "dumpwrist":
-                {
-                    var wristCol = GameObject.Find("robot_wrist_1_tcol (11)").transform;
-                    dumpPosition(wristCol);
-                    break;
-                }
+                        break;
+                    }
+                case "dumpwrist": {
+                        var wristCol = GameObject.Find("robot_wrist_1_tcol (11)").transform;
+                        dumpPosition(wristCol);
+                        break;
+                    }
 
-                case "debugarm":
-                {
-                    var arm = CurrentActiveController()
-                        .GetComponentInChildren<IK_Robot_Arm_Controller>();
-                    ArmMetadata armmeta = arm.GenerateMetadata();
-                    Debug.Log("last joint position");
-                    Vector3 rrpos = armmeta.joints[armmeta.joints.Length - 1].rootRelativePosition;
-                    Debug.Log(
-                        "Root Relative Arm Position - x:"
-                            + rrpos.x.ToString("0.###")
-                            + " y:"
-                            + rrpos.y.ToString("0.###")
-                            + " z:"
-                            + rrpos.z.ToString("0.###")
-                    );
-                    break;
-                }
-
-                case "debugstretcharmjoints":
-                {
-                    var arm = CurrentActiveController()
-                        .GetComponentInChildren<Stretch_Robot_Arm_Controller>();
-                    ArmMetadata armmeta = arm.GenerateMetadata();
-                    foreach (JointMetadata jm in armmeta.joints)
-                    {
-                        Debug.Log(
-                            jm.name
-                                + " position: ("
-                                + jm.position.x
-                                + ", "
-                                + jm.position.y
-                                + ", "
-                                + jm.position.z
-                                + ")"
-                        );
+                case "debugarm": {
+                        var arm = CurrentActiveController()
+                            .GetComponentInChildren<IK_Robot_Arm_Controller>();
+                        ArmMetadata armmeta = arm.GenerateMetadata();
+                        Debug.Log("last joint position");
+                        Vector3 rrpos = armmeta.joints[armmeta.joints.Length - 1].rootRelativePosition;
                         Debug.Log(
-                            jm.name
-                                + " root-relative position: ("
-                                + jm.rootRelativePosition.x
-                                + ", "
-                                + jm.rootRelativePosition.y
-                                + ", "
-                                + jm.rootRelativePosition.z
-                                + ")"
+                            "Root Relative Arm Position - x:"
+                                + rrpos.x.ToString("0.###")
+                                + " y:"
+                                + rrpos.y.ToString("0.###")
+                                + " z:"
+                                + rrpos.z.ToString("0.###")
                         );
-                        Debug.Log(jm.name + " rotation: " + jm.rotation);
-                        Debug.Log(jm.name + " root-relative rotation: " + jm.rootRelativeRotation);
-                        Debug.Log(jm.name + " local rotation: " + jm.localRotation);
+                        break;
                     }
-                    break;
-                }
 
-                case "debugarmjoints":
-                {
-                    var arm = CurrentActiveController()
-                        .GetComponentInChildren<IK_Robot_Arm_Controller>();
-                    ArmMetadata armmeta = arm.GenerateMetadata();
-                    foreach (JointMetadata jm in armmeta.joints)
-                    {
-                        Debug.Log(
-                            jm.name
-                                + " position: ("
-                                + jm.position.x
-                                + ", "
-                                + jm.position.y
-                                + ", "
-                                + jm.position.z
-                                + ")"
-                        );
-                        Debug.Log(
-                            jm.name
-                                + " root-relative position: ("
-                                + jm.rootRelativePosition.x
-                                + ", "
-                                + jm.rootRelativePosition.y
-                                + ", "
-                                + jm.rootRelativePosition.z
-                                + ")"
-                        );
-                        Debug.Log(jm.name + " rotation: " + jm.rotation);
-                        Debug.Log(jm.name + " root-relative rotation: " + jm.rootRelativeRotation);
-                        Debug.Log(jm.name + " local rotation: " + jm.localRotation);
+                case "debugstretcharmjoints": {
+                        var arm = CurrentActiveController()
+                            .GetComponentInChildren<Stretch_Robot_Arm_Controller>();
+                        ArmMetadata armmeta = arm.GenerateMetadata();
+                        foreach (JointMetadata jm in armmeta.joints) {
+                            Debug.Log(
+                                jm.name
+                                    + " position: ("
+                                    + jm.position.x
+                                    + ", "
+                                    + jm.position.y
+                                    + ", "
+                                    + jm.position.z
+                                    + ")"
+                            );
+                            Debug.Log(
+                                jm.name
+                                    + " root-relative position: ("
+                                    + jm.rootRelativePosition.x
+                                    + ", "
+                                    + jm.rootRelativePosition.y
+                                    + ", "
+                                    + jm.rootRelativePosition.z
+                                    + ")"
+                            );
+                            Debug.Log(jm.name + " rotation: " + jm.rotation);
+                            Debug.Log(jm.name + " root-relative rotation: " + jm.rootRelativeRotation);
+                            Debug.Log(jm.name + " local rotation: " + jm.localRotation);
+                        }
+                        break;
                     }
-                    break;
-                }
 
-                case "posarm1":
-                {
-                    var arm = CurrentActiveController()
-                        .GetComponentInChildren<IK_Robot_Arm_Controller>();
-                    var armTarget = arm
-                        .transform.Find("robot_arm_FK_IK_rig")
-                        .Find("IK_rig")
-                        .Find("IK_pos_rot_manipulator");
-                    armTarget.transform.position = new Vector3(-0.72564f, 0.901f, 0.72564f);
-                    break;
-                }
+                case "debugarmjoints": {
+                        var arm = CurrentActiveController()
+                            .GetComponentInChildren<IK_Robot_Arm_Controller>();
+                        ArmMetadata armmeta = arm.GenerateMetadata();
+                        foreach (JointMetadata jm in armmeta.joints) {
+                            Debug.Log(
+                                jm.name
+                                    + " position: ("
+                                    + jm.position.x
+                                    + ", "
+                                    + jm.position.y
+                                    + ", "
+                                    + jm.position.z
+                                    + ")"
+                            );
+                            Debug.Log(
+                                jm.name
+                                    + " root-relative position: ("
+                                    + jm.rootRelativePosition.x
+                                    + ", "
+                                    + jm.rootRelativePosition.y
+                                    + ", "
+                                    + jm.rootRelativePosition.z
+                                    + ")"
+                            );
+                            Debug.Log(jm.name + " rotation: " + jm.rotation);
+                            Debug.Log(jm.name + " root-relative rotation: " + jm.rootRelativeRotation);
+                            Debug.Log(jm.name + " local rotation: " + jm.localRotation);
+                        }
+                        break;
+                    }
 
-                case "slide1":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_04_2021_16_44_01");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "posarm1": {
+                        var arm = CurrentActiveController()
+                            .GetComponentInChildren<IK_Robot_Arm_Controller>();
+                        var armTarget = arm
+                            .transform.Find("robot_arm_FK_IK_rig")
+                            .Find("IK_rig")
+                            .Find("IK_pos_rot_manipulator");
+                        armTarget.transform.position = new Vector3(-0.72564f, 0.901f, 0.72564f);
+                        break;
+                    }
 
-                case "slide2":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_04_2021_20_51_23");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide1": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_04_2021_16_44_01");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "slide3":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_04_2021_23_31_11");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide2": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_04_2021_20_51_23");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "slide4":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_05_2021_01_26_52");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide3": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_04_2021_23_31_11");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "slide5":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_05_2021_02_58_54");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide4": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_05_2021_01_26_52");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "slide6":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_05_2021_07_28_25");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide5": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_05_2021_02_58_54");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "slide7":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("run 02_05_2021_08_36_10");
-                    commands.Add("debugarmjoints");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide6": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_05_2021_07_28_25");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "ras1":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("rr");
-                    commands.Add("inita");
-                    commands.Add("telefull -1.0 0.9009995460510254 1 135");
-                    commands.Add("ld 20");
-                    commands.Add("posarm1");
-                    commands.Add("msr");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "slide7": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("run 02_05_2021_08_36_10");
+                        commands.Add("debugarmjoints");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "ras2":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("inita");
-                    commands.Add("telefull -1.0 0.9009995460510254 1 135");
-                    commands.Add("ld 20");
-                    commands.Add("posarm1");
-                    commands.Add("msa");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
-                case "reproarmrot1":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("telefull -1.0 0.9009995460510254 1.5 90");
-                    commands.Add("mmla 0.0 0.0 0.2 1.0");
-                    commands.Add("debugarm");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "ras1": {
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("rr");
+                        commands.Add("inita");
+                        commands.Add("telefull -1.0 0.9009995460510254 1 135");
+                        commands.Add("ld 20");
+                        commands.Add("posarm1");
+                        commands.Add("msr");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "reproarmrot2":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("inita");
-                    commands.Add("telefull -1.0 0.9009995460510254 1.5 45");
-                    commands.Add("mmla 0.0 0.0 0.2 1.0");
-                    commands.Add("debugarm");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
-                case "reproarmsphere3":
-                {
-                    GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                    go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
-                    go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
-                    go.GetComponent<SphereCollider>().enabled = false;
-                    go.AddComponent(typeof(MeshCollider));
-                    MeshCollider mc = go.GetComponent<MeshCollider>();
-                    mc.convex = true;
-                    mc.isTrigger = true;
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("rr");
-                    commands.Add("inita");
-                    commands.Add("mmlah 1 1 True True");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
-                case "reproarmsphere2":
-                {
-                    GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                    go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
-                    go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
-                    go.GetComponent<SphereCollider>().enabled = false;
-                    go.AddComponent(typeof(MeshCollider));
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("rr");
-                    commands.Add("inita");
-                    commands.Add("mmlah 1 1 True True");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
-                case "reproarmsphere1":
-                {
-                    GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-                    go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
-                    go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
-                    SphereCollider sc = go.GetComponent<SphereCollider>();
-                    sc.isTrigger = true;
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("rr");
-                    commands.Add("inita");
-                    commands.Add("mmlah 1 1 True True");
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
-                case "reproarmstuck":
-                {
-                    List<string> commands = new List<string>();
-                    commands.Add("pp");
-                    commands.Add("rr");
-                    commands.Add("inita");
-                    commands.Add("mmlah 1 1 True True");
-                    commands.Add("telefull");
-                    commands.Add("mmlah 0.5203709825292535 2 True True");
-                    commands.Add(
-                        "mmla 0.01000303 -1.63912773e-06 0.558107364 2 armBase True False True"
-                    );
-                    StartCoroutine(ExecuteBatch(commands));
-                    break;
-                }
+                case "ras2": {
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("inita");
+                        commands.Add("telefull -1.0 0.9009995460510254 1 135");
+                        commands.Add("ld 20");
+                        commands.Add("posarm1");
+                        commands.Add("msa");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+                case "reproarmrot1": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("telefull -1.0 0.9009995460510254 1.5 90");
+                        commands.Add("mmla 0.0 0.0 0.2 1.0");
+                        commands.Add("debugarm");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "ap":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "AdvancePhysicsStep";
-                    action["timeStep"] = 0.02f; // max 0.05, min 0.01
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "reproarmrot2": {
+                        List<string> commands = new List<string>();
+                        commands.Add("inita");
+                        commands.Add("telefull -1.0 0.9009995460510254 1.5 45");
+                        commands.Add("mmla 0.0 0.0 0.2 1.0");
+                        commands.Add("debugarm");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+                case "reproarmsphere3": {
+                        GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                        go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
+                        go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+                        go.GetComponent<SphereCollider>().enabled = false;
+                        go.AddComponent(typeof(MeshCollider));
+                        MeshCollider mc = go.GetComponent<MeshCollider>();
+                        mc.convex = true;
+                        mc.isTrigger = true;
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("rr");
+                        commands.Add("inita");
+                        commands.Add("mmlah 1 1 True True");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+                case "reproarmsphere2": {
+                        GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                        go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
+                        go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+                        go.GetComponent<SphereCollider>().enabled = false;
+                        go.AddComponent(typeof(MeshCollider));
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("rr");
+                        commands.Add("inita");
+                        commands.Add("mmlah 1 1 True True");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+                case "reproarmsphere1": {
+                        GameObject go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+                        go.transform.position = new Vector3(-0.6648f, 1.701f, 1.421f);
+                        go.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+                        SphereCollider sc = go.GetComponent<SphereCollider>();
+                        sc.isTrigger = true;
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("rr");
+                        commands.Add("inita");
+                        commands.Add("mmlah 1 1 True True");
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
+                case "reproarmstuck": {
+                        List<string> commands = new List<string>();
+                        commands.Add("pp");
+                        commands.Add("rr");
+                        commands.Add("inita");
+                        commands.Add("mmlah 1 1 True True");
+                        commands.Add("telefull");
+                        commands.Add("mmlah 0.5203709825292535 2 True True");
+                        commands.Add(
+                            "mmla 0.01000303 -1.63912773e-06 0.558107364 2 armBase True False True"
+                        );
+                        StartCoroutine(ExecuteBatch(commands));
+                        break;
+                    }
 
-                case "up":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "UnpausePhysicsAutoSim";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "ap": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "AdvancePhysicsStep";
+                        action["timeStep"] = 0.02f; // max 0.05, min 0.01
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "its":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "InitializeTableSetting";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectVariation"] = int.Parse(splitcommand[1]);
+                case "up": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "UnpausePhysicsAutoSim";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+
+                case "its": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "InitializeTableSetting";
+                        if (splitcommand.Length > 1) {
+                            action["objectVariation"] = int.Parse(splitcommand[1]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "potwhcb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PointsOverTableWhereHandCanBe";
-                    action["objectId"] = splitcommand[1];
-                    action["x"] = float.Parse(splitcommand[2]);
-                    action["z"] = float.Parse(splitcommand[3]);
+                case "potwhcb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PointsOverTableWhereHandCanBe";
+                        action["objectId"] = splitcommand[1];
+                        action["x"] = float.Parse(splitcommand[2]);
+                        action["z"] = float.Parse(splitcommand[3]);
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "pfrat":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "pfrat": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "PlaceFixedReceptacleAtLocation";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectVariation"] = int.Parse(splitcommand[1]);
-                        action["x"] = float.Parse(splitcommand[2]);
-                        action["y"] = float.Parse(splitcommand[3]);
-                        action["z"] = float.Parse(splitcommand[4]);
+                        action["action"] = "PlaceFixedReceptacleAtLocation";
+                        if (splitcommand.Length > 1) {
+                            action["objectVariation"] = int.Parse(splitcommand[1]);
+                            action["x"] = float.Parse(splitcommand[2]);
+                            action["y"] = float.Parse(splitcommand[3]);
+                            action["z"] = float.Parse(splitcommand[4]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "pbwal":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    action["action"] = "PlaceBookWallAtLocation";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectVariation"] = int.Parse(splitcommand[1]);
-                        action["x"] = float.Parse(splitcommand[2]);
-                        action["y"] = float.Parse(splitcommand[3]);
-                        action["z"] = float.Parse(splitcommand[4]);
-                        action["rotation"] = new Vector3(0f, float.Parse(splitcommand[5]), 0f);
+                case "pbwal": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        action["action"] = "PlaceBookWallAtLocation";
+                        if (splitcommand.Length > 1) {
+                            action["objectVariation"] = int.Parse(splitcommand[1]);
+                            action["x"] = float.Parse(splitcommand[2]);
+                            action["y"] = float.Parse(splitcommand[3]);
+                            action["z"] = float.Parse(splitcommand[4]);
+                            action["rotation"] = new Vector3(0f, float.Parse(splitcommand[5]), 0f);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // random toggle state of all objects
-                case "rts":
-                {
-                    ServerAction action = new ServerAction();
+                case "rts": {
+                        ServerAction action = new ServerAction();
 
-                    action.randomSeed = 0;
-                    action.action = "RandomToggleStateOfAllObjects";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "rtss":
-                {
-                    ServerAction action = new ServerAction();
+                        action.randomSeed = 0;
+                        action.action = "RandomToggleStateOfAllObjects";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    action.randomSeed = 0;
-                    action.StateChange = "CanOpen";
-                    action.action = "RandomToggleSpecificState";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "rtss": {
+                        ServerAction action = new ServerAction();
 
-                case "l":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ChangeLightSet";
-                    if (splitcommand.Length == 2)
-                    {
-                        action.objectVariation = int.Parse(splitcommand[1]);
+                        action.randomSeed = 0;
+                        action.StateChange = "CanOpen";
+                        action.action = "RandomToggleSpecificState";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "l": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ChangeLightSet";
+                        if (splitcommand.Length == 2) {
+                            action.objectVariation = int.Parse(splitcommand[1]);
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // set state of all objects that have a state
-                case "ssa":
-                {
-                    ServerAction action = new ServerAction();
+                case "ssa": {
+                        ServerAction action = new ServerAction();
 
-                    action.StateChange = "CanBeDirty";
-                    action.forceAction = true;
-                    action.action = "SetStateOfAllObjects";
+                        action.StateChange = "CanBeDirty";
+                        action.forceAction = true;
+                        action.action = "SetStateOfAllObjects";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        if (splitcommand[1] == "t")
-                        {
-                            action.forceAction = true;
-                        }
+                        if (splitcommand.Length > 1) {
+                            if (splitcommand[1] == "t") {
+                                action.forceAction = true;
+                            }
 
-                        if (splitcommand[1] == "f")
-                        {
-                            action.forceAction = false;
+                            if (splitcommand[1] == "f") {
+                                action.forceAction = false;
+                            }
                         }
+                        CurrentActiveController().ProcessControlCommand(action);
+
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                case "initsynth": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                case "initsynth":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["renderNormalsImage"] = true;
+                        action["renderDepthImage"] = true;
+                        action["renderSemanticSegmentation"] = true;
+                        action["renderInstanceSegmentation"] = true;
+                        action["renderFlowImage"] = true;
 
-                    action["renderNormalsImage"] = true;
-                    action["renderDepthImage"] = true;
-                    action["renderSemanticSegmentation"] = true;
-                    action["renderInstanceSegmentation"] = true;
-                    action["renderFlowImage"] = true;
+                        // action.ssao = "default";
 
-                    // action.ssao = "default";
+                        action["action"] = "Initialize";
+                        ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
+                        break;
+                    }
 
-                    action["action"] = "Initialize";
-                    ActionDispatcher.Dispatch(AManager, new DynamicServerAction(action));
-                    break;
-                }
+                case "atpc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "AddThirdPartyCamera",
+                            ["position"] = new Vector3(1, 1, 1),
+                            ["rotation"] = new Vector3(10, 20, 30),
+                            ["parent"] = "agent",
+                            ["agentPositionRelativeCoordinates"] = true
+                        };
 
-                case "atpc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "AddThirdPartyCamera",
-                        ["position"] = new Vector3(1, 1, 1),
-                        ["rotation"] = new Vector3(10, 20, 30),
-                        ["parent"] = "agent",
-                        ["agentPositionRelativeCoordinates"] = true
-                    };
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    break;
-                }
+                case "utpc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateThirdPartyCamera",
+                            ["position"] = new Vector3(2, 2, 2),
+                            ["rotation"] = new Vector3(15, 25, 35),
+                            ["thirdPartyCameraId"] = 1,
+                            ["parent"] = "agent",
+                            ["agentPositionRelativeCoordinates"] = true
+                        };
 
-                case "utpc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateThirdPartyCamera",
-                        ["position"] = new Vector3(2, 2, 2),
-                        ["rotation"] = new Vector3(15, 25, 35),
-                        ["thirdPartyCameraId"] = 1,
-                        ["parent"] = "agent",
-                        ["agentPositionRelativeCoordinates"] = true
-                    };
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    break;
-                }
+                case "umc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "UpdateMainCamera",
+                            ["position"] = new Vector3(0.5f, 0.5f, 0.5f),
+                            ["rotation"] = new Vector3(15, 25, 35),
+                            ["fieldOfView"] = 120f,
+                            //["agentPositionRelativeCoordinates"] = false
+                        };
 
-                case "umc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "UpdateMainCamera",
-                        ["position"] = new Vector3(0.5f, 0.5f, 0.5f),
-                        ["rotation"] = new Vector3(15, 25, 35),
-                        ["fieldOfView"] = 120f,
-                        //["agentPositionRelativeCoordinates"] = false
-                    };
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action), AManager);
+                        break;
+                    }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action), AManager);
-                    break;
-                }
+                case "debugmaincamera": {
+                        CurrentActiveController().generateMetadataWrapper();
+                        break;
+                    }
+                case "to": {
+                        ServerAction action = new ServerAction();
+                        action.action = "TeleportObject";
+                        action.objectId = splitcommand[1];
+                        action.x = float.Parse(splitcommand[2]);
+                        action.y = float.Parse(splitcommand[3]);
+                        action.z = float.Parse(splitcommand[4]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "daoot": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DisableAllObjectsOfType";
+                        action.objectId = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "ctlq": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ChangeQuality";
+                        action.quality = "Very Low";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "roco": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RandomlyOpenCloseObjects";
+                        action["randomSeed"] = (new System.Random()).Next(1, 1000000);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "crouch": {
+                        ExecuteAction("Crouch");
+                        break;
+                    }
+                case "stand": {
+                        ExecuteAction("Stand");
+                        break;
+                    }
 
-                case "debugmaincamera":
-                {
-                    CurrentActiveController().generateMetadataWrapper();
-                    break;
-                }
-                case "to":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "TeleportObject";
-                    action.objectId = splitcommand[1];
-                    action.x = float.Parse(splitcommand[2]);
-                    action.y = float.Parse(splitcommand[3]);
-                    action.z = float.Parse(splitcommand[4]);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "daoot":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DisableAllObjectsOfType";
-                    action.objectId = splitcommand[1];
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "ctlq":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ChangeQuality";
-                    action.quality = "Very Low";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "roco":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RandomlyOpenCloseObjects";
-                    action["randomSeed"] = (new System.Random()).Next(1, 1000000);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "crouch":
-                {
-                    ExecuteAction("Crouch");
-                    break;
-                }
-                case "stand":
-                {
-                    ExecuteAction("Stand");
-                    break;
-                }
+                case "remove": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RemoveFromScene";
 
-                case "remove":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RemoveFromScene";
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1];
+                        }
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "putr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PutObject";
+                        action["objectId"] = (
+                            (PhysicsRemoteFPSAgentController)CurrentActiveController()
+                        ).ObjectIdOfClosestReceptacleObject();
+                        action["randomSeed"] = int.Parse(splitcommand[1]);
 
-                case "putr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PutObject";
-                    action["objectId"] = (
-                        (PhysicsRemoteFPSAgentController)CurrentActiveController()
-                    ).ObjectIdOfClosestReceptacleObject();
-                    action["randomSeed"] = int.Parse(splitcommand[1]);
+                        // set this to false if we want to place it and let physics resolve by having it fall a short distance into position
 
-                    // set this to false if we want to place it and let physics resolve by having it fall a short distance into position
+                        // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
+                        action["placeStationary"] = false;
 
-                    // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
-                    action["placeStationary"] = false;
+                        // set this true to ignore Placement Restrictions
+                        action["forceAction"] = true;
 
-                    // set this true to ignore Placement Restrictions
-                    action["forceAction"] = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "put": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PutObject";
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "put":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PutObject";
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1];
+                        }
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "putxy": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PutObject";
 
-                case "putxy":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PutObject";
+                        if (splitcommand.Length == 2) {
+                            action["putNearXY"] = bool.Parse(splitcommand[1]);
+                        }
+                        // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
+                        // action["placeStationary"] = true;
+                        action["x"] = 0.5f;
+                        action["y"] = 0.5f;
+                        // set this true to ignore Placement Restrictions
+                        // action["forceAction"] = true;
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action["putNearXY"] = bool.Parse(splitcommand[1]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
-                    // action["placeStationary"] = true;
-                    action["x"] = 0.5f;
-                    action["y"] = 0.5f;
-                    // set this true to ignore Placement Restrictions
-                    // action["forceAction"] = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "goif":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetObjectInFrame";
-                    action["x"] = 0.5f;
-                    action["y"] = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "goif": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetObjectInFrame";
+                        action["x"] = 0.5f;
+                        action["y"] = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // put an object down with stationary false
-                case "putf":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PutObject";
-
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else
-                    {
-                        action["objectId"] = PhysicsController.ObjectIdOfClosestReceptacleObject();
-                    }
+                case "putf": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PutObject";
+
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1];
+                        } else {
+                            action["objectId"] = PhysicsController.ObjectIdOfClosestReceptacleObject();
+                        }
 
-                    // set this to false if we want to place it and let physics resolve by having it fall a short distance into position
+                        // set this to false if we want to place it and let physics resolve by having it fall a short distance into position
 
-                    // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
-                    action["placeStationary"] = false;
+                        // set true to place with kinematic = true so that it doesn't fall or roll in place - making placement more consistant and not physics engine reliant - this more closely mimics legacy pivot placement behavior
+                        action["placeStationary"] = false;
 
-                    // set this true to ignore Placement Restrictions
-                    action["forceAction"] = true;
+                        // set this true to ignore Placement Restrictions
+                        action["forceAction"] = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // make all pickupable objects kinematic false so that they will react to collisions. Otherwise, some objects might be defaulted to kinematic true, or
                 // if they were placed with placeStationary true, then they will not interact with outside collisions immediately.
-                case "maom":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MakeAllObjectsMoveable";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "echoes":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MakeAllObjectsStationary";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "maom": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MakeAllObjectsMoveable";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "gip":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetInteractablePoses";
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1].ToString();
+                case "echoes": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MakeAllObjectsStationary";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        action["objectId"] = "Fridge|-02.10|+00.00|+01.07";
+
+                case "gip": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetInteractablePoses";
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1].ToString();
+                        } else {
+                            action["objectId"] = "Fridge|-02.10|+00.00|+01.07";
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // tests the Reset function on AgentManager.cs, adding a path to it from the PhysicsController
-                case "reset":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "Reset";
-                    ExecuteAction("Reset");
-                    break;
-                }
-
-                case "poap":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PlaceObjectAtPoint";
+                case "reset": {
+                        ServerAction action = new ServerAction();
+                        action.action = "Reset";
+                        ExecuteAction("Reset");
+                        break;
+                    }
 
-                    BaseFPSAgentController agent = AManager.agents[0];
+                case "poap": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PlaceObjectAtPoint";
 
-                    GameObject itemInHand = AManager.agents[0].ItemInHand;
-                    if (itemInHand != null)
-                    {
-                        itemInHand.SetActive(false);
-                    }
+                        BaseFPSAgentController agent = AManager.agents[0];
 
-                    RaycastHit hit;
-                    Ray ray = agent.m_Camera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0.0f));
-                    bool raycastDidHit = Physics.Raycast(ray, out hit, 10f, (1 << 8) | (1 << 10));
+                        GameObject itemInHand = AManager.agents[0].ItemInHand;
+                        if (itemInHand != null) {
+                            itemInHand.SetActive(false);
+                        }
 
-                    print("where did the ray land? " + hit.point);
-                    if (itemInHand != null)
-                    {
-                        itemInHand.SetActive(true);
-                    }
+                        RaycastHit hit;
+                        Ray ray = agent.m_Camera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0.0f));
+                        bool raycastDidHit = Physics.Raycast(ray, out hit, 10f, (1 << 8) | (1 << 10));
 
-                    if (raycastDidHit)
-                    {
-                        SimObjPhysics sop = null;
-                        if (itemInHand != null)
-                        {
-                            sop = itemInHand.GetComponent<SimObjPhysics>();
+                        print("where did the ray land? " + hit.point);
+                        if (itemInHand != null) {
+                            itemInHand.SetActive(true);
                         }
-                        else
-                        {
-                            SimObjPhysics[] allSops = GameObject.FindObjectsOfType<SimObjPhysics>();
-                            sop = allSops[UnityEngine.Random.Range(0, allSops.Length)];
+
+                        if (raycastDidHit) {
+                            SimObjPhysics sop = null;
+                            if (itemInHand != null) {
+                                sop = itemInHand.GetComponent<SimObjPhysics>();
+                            } else {
+                                SimObjPhysics[] allSops = GameObject.FindObjectsOfType<SimObjPhysics>();
+                                sop = allSops[UnityEngine.Random.Range(0, allSops.Length)];
+                            }
+                            // adding y offset to position so that the downward raycast used in PlaceObjectAtPoint correctly collides with surface below point
+                            action["position"] = hit.point + new Vector3(0, 0.5f, 0);
+                            action["objectId"] = sop.ObjectID;
+
+                            Debug.Log(action);
+                            CurrentActiveController().ProcessControlCommand(action);
+                        } else {
+                            agent.actionFinished(false);
                         }
-                        // adding y offset to position so that the downward raycast used in PlaceObjectAtPoint correctly collides with surface below point
-                        action["position"] = hit.point + new Vector3(0, 0.5f, 0);
-                        action["objectId"] = sop.ObjectID;
 
-                        Debug.Log(action);
-                        CurrentActiveController().ProcessControlCommand(action);
-                    }
-                    else
-                    {
-                        agent.actionFinished(false);
+                        break;
                     }
 
-                    break;
-                }
-
                 // set forceVisible to true if you want objects to not spawn inside receptacles and only out in the open
                 // set forceAction to true to spawn with kinematic = true to more closely resemble pivot functionality
-                case "irs":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "InitialRandomSpawn";
-
-                    // List<string> excludedObjectIds = new List<string>();
-                    // foreach (SimObjPhysics sop in AManager.agents[0].VisibleSimObjs(false)) {
-                    //     excludedObjectIds.Add(sop.ObjectID);
-                    // }
-                    // action["excludedObjectIds"] = excludedObjectIds.ToArray();
-
-                    // give me a seed
-                    if (splitcommand.Length == 2)
-                    {
-                        action["randomSeed"] = int.Parse(splitcommand[1]);
-                        action["forceVisible"] = false;
-                        action["numPlacementAttempts"] = 5;
-                    }
-                    // should objects be spawned only in immediately visible areas?
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["randomSeed"] = int.Parse(splitcommand[1]);
+                case "irs": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "InitialRandomSpawn";
 
-                        if (splitcommand[2] == "t")
-                        {
-                            action["forceVisible"] = true;
-                        }
+                        // List<string> excludedObjectIds = new List<string>();
+                        // foreach (SimObjPhysics sop in AManager.agents[0].VisibleSimObjs(false)) {
+                        //     excludedObjectIds.Add(sop.ObjectID);
+                        // }
+                        // action["excludedObjectIds"] = excludedObjectIds.ToArray();
 
-                        if (splitcommand[2] == "f")
-                        {
+                        // give me a seed
+                        if (splitcommand.Length == 2) {
+                            action["randomSeed"] = int.Parse(splitcommand[1]);
                             action["forceVisible"] = false;
+                            action["numPlacementAttempts"] = 5;
                         }
-                    }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["randomSeed"] = int.Parse(splitcommand[1]);
+                        // should objects be spawned only in immediately visible areas?
+                        else if (splitcommand.Length == 3) {
+                            action["randomSeed"] = int.Parse(splitcommand[1]);
 
-                        if (splitcommand[2] == "t")
-                        {
-                            action["forceVisible"] = true;
-                        }
+                            if (splitcommand[2] == "t") {
+                                action["forceVisible"] = true;
+                            }
 
-                        if (splitcommand[2] == "f")
-                        {
-                            action["forceVisible"] = false;
+                            if (splitcommand[2] == "f") {
+                                action["forceVisible"] = false;
+                            }
+                        } else if (splitcommand.Length == 4) {
+                            action["randomSeed"] = int.Parse(splitcommand[1]);
+
+                            if (splitcommand[2] == "t") {
+                                action["forceVisible"] = true;
+                            }
+
+                            if (splitcommand[2] == "f") {
+                                action["forceVisible"] = false;
+                            }
+
+                            action["numPlacementAttempts"] = int.Parse(splitcommand[3]);
+                        } else {
+                            action["randomSeed"] = 0;
+                            action["forceVisible"] = false; // true;
+                            action["numPlacementAttempts"] = 20;
                         }
 
-                        action["numPlacementAttempts"] = int.Parse(splitcommand[3]);
-                    }
-                    else
-                    {
-                        action["randomSeed"] = 0;
-                        action["forceVisible"] = false; // true;
-                        action["numPlacementAttempts"] = 20;
-                    }
+                        // ObjectTypeCount otc = new ObjectTypeCount();
+                        // otc.objectType = "Mug";
+                        // otc.count = 20;
+                        // ObjectTypeCount[] count = new ObjectTypeCount[1];
+                        // count[0] = otc;
+                        // action.numDuplicatesOfType = count;
+
+                        String[] excludeThese = new String[1];
+                        excludeThese[0] = "CounterTop";
+                        action["excludedReceptacles"] = excludeThese;
 
-                    // ObjectTypeCount otc = new ObjectTypeCount();
-                    // otc.objectType = "Mug";
-                    // otc.count = 20;
-                    // ObjectTypeCount[] count = new ObjectTypeCount[1];
-                    // count[0] = otc;
-                    // action.numDuplicatesOfType = count;
+                        action["placeStationary"] = false; // set to false to spawn with kinematic = false, set to true to spawn everything kinematic true and they won't roll around
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    String[] excludeThese = new String[1];
-                    excludeThese[0] = "CounterTop";
-                    action["excludedReceptacles"] = excludeThese;
+                        break;
+                    }
+                case "spawn": {
+                        ServerAction action = new ServerAction();
+                        // Debug.Log(action.objectVariation);
+                        int objectVariation = 0;
+                        if (splitcommand.Length == 2) {
+                            action.objectType = splitcommand[1];
+                        } else if (splitcommand.Length == 3) {
+                            action.objectType = splitcommand[1];
+                            objectVariation = int.Parse(splitcommand[2]);
+                        } else {
+                            action.objectType = "Tomato"; // default to spawn debug tomato
+                        }
+                        action.action = "CreateObject";
+                        action.randomizeObjectAppearance = false; // pick randomly from available or not?
+                        action.objectVariation = objectVariation; // if random false, which version of the object to spawn? (there are only 3 of each type atm)
 
-                    action["placeStationary"] = false; // set to false to spawn with kinematic = false, set to true to spawn everything kinematic true and they won't roll around
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
-                case "spawn":
-                {
-                    ServerAction action = new ServerAction();
-                    // Debug.Log(action.objectVariation);
-                    int objectVariation = 0;
-                    if (splitcommand.Length == 2)
-                    {
-                        action.objectType = splitcommand[1];
+                        break;
                     }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action.objectType = splitcommand[1];
-                        objectVariation = int.Parse(splitcommand[2]);
+
+                case "neutral": {
+                        ExecuteAction("ChangeAgentFaceToNeutral");
+                        break;
                     }
-                    else
-                    {
-                        action.objectType = "Tomato"; // default to spawn debug tomato
+                case "happy": {
+                        ExecuteAction("ChangeAgentFaceToHappy");
+                        break;
                     }
-                    action.action = "CreateObject";
-                    action.randomizeObjectAppearance = false; // pick randomly from available or not?
-                    action.objectVariation = objectVariation; // if random false, which version of the object to spawn? (there are only 3 of each type atm)
-
-                    CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
-
-                case "neutral":
-                {
-                    ExecuteAction("ChangeAgentFaceToNeutral");
-                    break;
-                }
-                case "happy":
-                {
-                    ExecuteAction("ChangeAgentFaceToHappy");
-                    break;
-                }
+                case "mad": {
+                        ExecuteAction("ChangeAgentFaceToMad");
+                        break;
+                    }
 
-                case "mad":
-                {
-                    ExecuteAction("ChangeAgentFaceToMad");
-                    break;
-                }
+                case "supermad": {
+                        ExecuteAction("ChangeAgentFaceToSuperMad");
+                        break;
+                    }
 
-                case "supermad":
-                {
-                    ExecuteAction("ChangeAgentFaceToSuperMad");
-                    break;
-                }
+                case "ruaa": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RotateUniverseAroundAgent";
 
-                case "ruaa":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RotateUniverseAroundAgent";
+                        action.rotation = new Vector3(0f, float.Parse(splitcommand[1]), 0f);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "thas": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ToggleHideAndSeekObjects";
 
-                    action.rotation = new Vector3(0f, float.Parse(splitcommand[1]), 0f);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "thas":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ToggleHideAndSeekObjects";
-
-                    if (splitcommand.Length == 2)
-                    {
-                        if (splitcommand[1] == "t")
-                        {
-                            action["forceVisible"] = true;
-                        }
+                        if (splitcommand.Length == 2) {
+                            if (splitcommand[1] == "t") {
+                                action["forceVisible"] = true;
+                            }
 
-                        if (splitcommand[1] == "f")
-                        {
+                            if (splitcommand[1] == "f") {
+                                action["forceVisible"] = false;
+                            }
+                        } else {
                             action["forceVisible"] = false;
                         }
-                    }
-                    else
-                    {
-                        action["forceVisible"] = false;
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "spawnat": {
+                        ServerAction action = new ServerAction();
+
+                        if (splitcommand.Length > 1) {
+                            action.objectType = splitcommand[1];
+                            action.position = new Vector3(
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3]),
+                                float.Parse(splitcommand[4])
+                            );
+                            action.rotation = new Vector3(
+                                float.Parse(splitcommand[5]),
+                                float.Parse(splitcommand[6]),
+                                float.Parse(splitcommand[7])
+                            );
+                            // action.rotation?
+                        }
+                        // default to zeroed out rotation tomato
+                        else {
+                            action.objectType = "Tomato"; // default to spawn debug tomato
+                            action.position = Vector3.zero;
+                            action.rotation = Vector3.zero;
+                        }
+                        action.action = "CreateObjectAtLocation";
 
-                case "spawnat":
-                {
-                    ServerAction action = new ServerAction();
+                        action.randomizeObjectAppearance = false; // pick randomly from available or not?
+                        action.objectVariation = 1; // if random false, which version of the object to spawn? (there are only 3 of each type atm)
 
-                    if (splitcommand.Length > 1)
-                    {
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "grpfo": {
+                        ServerAction action = new ServerAction();
+                        action.action = "GetReachablePositionsForObject";
+                        action.objectId = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "rspawnlifted": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RandomlyCreateLiftedFurniture";
+                        action.objectType = "Television";
+                        action.objectVariation = 1;
+                        action.y = 1.3f;
+                        action.z = 1;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "rspawnfloor": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RandomlyCreateAndPlaceObjectOnFloor";
+                        action["objectType"] = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "spawnfloor": {
+                        ServerAction action = new ServerAction();
+                        int objectVariation = 1;
                         action.objectType = splitcommand[1];
-                        action.position = new Vector3(
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3]),
-                            float.Parse(splitcommand[4])
-                        );
-                        action.rotation = new Vector3(
-                            float.Parse(splitcommand[5]),
-                            float.Parse(splitcommand[6]),
-                            float.Parse(splitcommand[7])
-                        );
-                        // action.rotation?
+                        action.x = float.Parse(splitcommand[2]);
+                        action.z = float.Parse(splitcommand[3]);
+
+                        action.action = "CreateObjectOnFloor";
+                        action.objectVariation = objectVariation;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    // default to zeroed out rotation tomato
-                    else
-                    {
-                        action.objectType = "Tomato"; // default to spawn debug tomato
-                        action.position = Vector3.zero;
-                        action.rotation = Vector3.zero;
+                case "gusfo": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetUnreachableSilhouetteForObject";
+                        action["objectId"] = splitcommand[1];
+                        action["z"] = float.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action.action = "CreateObjectAtLocation";
 
-                    action.randomizeObjectAppearance = false; // pick randomly from available or not?
-                    action.objectVariation = 1; // if random false, which version of the object to spawn? (there are only 3 of each type atm)
+                case "rhs": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RandomizeHideSeekObjects";
+                        action["removeProb"] = float.Parse(splitcommand[1]);
+                        action["randomSeed"] = int.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "grpfo":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "GetReachablePositionsForObject";
-                    action.objectId = splitcommand[1];
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "rspawnlifted":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RandomlyCreateLiftedFurniture";
-                    action.objectType = "Television";
-                    action.objectVariation = 1;
-                    action.y = 1.3f;
-                    action.z = 1;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "rspawnfloor":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RandomlyCreateAndPlaceObjectOnFloor";
-                    action["objectType"] = splitcommand[1];
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "spawnfloor":
-                {
-                    ServerAction action = new ServerAction();
-                    int objectVariation = 1;
-                    action.objectType = splitcommand[1];
-                    action.x = float.Parse(splitcommand[2]);
-                    action.z = float.Parse(splitcommand[3]);
-
-                    action.action = "CreateObjectOnFloor";
-                    action.objectVariation = objectVariation;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "gusfo":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetUnreachableSilhouetteForObject";
-                    action["objectId"] = splitcommand[1];
-                    action["z"] = float.Parse(splitcommand[2]);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "cts": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ChangeTimeScale";
+                        action.timeScale = float.Parse(splitcommand[1]);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                case "rhs":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RandomizeHideSeekObjects";
-                    action["removeProb"] = float.Parse(splitcommand[1]);
-                    action["randomSeed"] = int.Parse(splitcommand[2]);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // NOTE: reachablePositions has been removed as a public variable
+                        // Debug.Log(PhysicsController.reachablePositions.Length);
 
-                case "cts":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ChangeTimeScale";
-                    action.timeScale = float.Parse(splitcommand[1]);
-                    CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    // NOTE: reachablePositions has been removed as a public variable
-                    // Debug.Log(PhysicsController.reachablePositions.Length);
+                case "grp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetReachablePositions";
+                        // action.maxStepCount = 10;
+                        if (splitcommand.Length == 2) {
+                            action["directionsRelativeAgent"] = bool.Parse(splitcommand[1]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        // NOTE: reachablePositions has been removed as a public variable
+                        // Debug.Log(PhysicsController.reachablePositions.Length);
 
-                case "grp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetReachablePositions";
-                    // action.maxStepCount = 10;
-                    if (splitcommand.Length == 2)
-                    {
-                        action["directionsRelativeAgent"] = bool.Parse(splitcommand[1]);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
 
-                    // NOTE: reachablePositions has been removed as a public variable
-                    // Debug.Log(PhysicsController.reachablePositions.Length);
+                case "grpb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetReachablePositions";
+                        // action.maxStepCount = 10;
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        // NOTE: reachablePositions has been removed as a public variable
+                        // Debug.Log("stochastic grp " + StochasticController.reachablePositions.Length);
 
-                case "grpb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetReachablePositions";
-                    // action.maxStepCount = 10;
-                    CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    // NOTE: reachablePositions has been removed as a public variable
-                    // Debug.Log("stochastic grp " + StochasticController.reachablePositions.Length);
+                case "csw": {
+                        ServerAction action = new ServerAction();
+                        action.action = "CoverSurfacesWith";
+                        // int objectVariation = 1;
+                        // action.objectVariation = objectVariation;
 
-                    break;
-                }
+                        if (splitcommand.Length == 2) {
+                            action.objectType = splitcommand[1];
+                        } else if (splitcommand.Length == 3) {
+                            action.objectType = splitcommand[1];
+                            action.objectVariation = int.Parse(splitcommand[2]);
+                        } else {
+                            action.objectType = "Tomato"; // default to spawn debug tomato
+                        }
+                        action.x = 0.3f;
+                        action.z = 0.3f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "csw":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "CoverSurfacesWith";
-                    // int objectVariation = 1;
-                    // action.objectVariation = objectVariation;
+                case "fov": {
+                        Dictionary<string, object> comm = new Dictionary<string, object>();
+                        comm["action"] = "ChangeFOV";
+                        comm["fieldOfView"] = float.Parse(splitcommand[1]);
+                        if (splitcommand.Length > 2) {
+                            comm["camera"] = splitcommand[2];
+                        }
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action.objectType = splitcommand[1];
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action.objectType = splitcommand[1];
-                        action.objectVariation = int.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(comm);
+                        break;
                     }
-                    else
-                    {
-                        action.objectType = "Tomato"; // default to spawn debug tomato
+                case "teles": {
+                        ServerAction action = new ServerAction();
+                        action.action = "TeleportFull";
+                        action.x = 4.42f;
+                        action.y = 0.9009f;
+                        action.z = -1.05f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action.x = 0.3f;
-                    action.z = 0.3f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "fov":
-                {
-                    Dictionary<string, object> comm = new Dictionary<string, object>();
-                    comm["action"] = "ChangeFOV";
-                    comm["fieldOfView"] = float.Parse(splitcommand[1]);
-                    if (splitcommand.Length > 2)
-                    {
-                        comm["camera"] = splitcommand[2];
+                case "map": {
+                        ExecuteAction("ToggleMapView");
+                        break;
+                    }
+                case "nopfwoiv": {
+                        ServerAction action = new ServerAction();
+                        action.action = "NumberOfPositionsObjectsOfTypeAreVisibleFrom";
+                        action.objectType = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-
-                    CurrentActiveController().ProcessControlCommand(comm);
-                    break;
-                }
-                case "teles":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "TeleportFull";
-                    action.x = 4.42f;
-                    action.y = 0.9009f;
-                    action.z = -1.05f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "map":
-                {
-                    ExecuteAction("ToggleMapView");
-                    break;
-                }
-                case "nopfwoiv":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "NumberOfPositionsObjectsOfTypeAreVisibleFrom";
-                    action.objectType = splitcommand[1];
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // Close visible objects
-                case "cvo":
-                {
-                    ExecuteAction("CloseVisibleObjects");
-                    break;
-                }
+                case "cvo": {
+                        ExecuteAction("CloseVisibleObjects");
+                        break;
+                    }
 
                 // Force open object at location
-                case "oal":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "OpenObjectAtLocation";
-                    action.x = float.Parse(splitcommand[1]);
-                    action.y = float.Parse(splitcommand[2]);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "oal": {
+                        ServerAction action = new ServerAction();
+                        action.action = "OpenObjectAtLocation";
+                        action.x = float.Parse(splitcommand[1]);
+                        action.y = float.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // Get objects in box
-                case "oib":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ObjectsInBox";
-                    action["x"] = float.Parse(splitcommand[1]);
-                    action["z"] = float.Parse(splitcommand[2]);
-                    CurrentActiveController().ProcessControlCommand(action);
-                    foreach (string s in PhysicsController.objectIdsInBox)
-                    {
-                        Debug.Log(s);
+                case "oib": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ObjectsInBox";
+                        action["x"] = float.Parse(splitcommand[1]);
+                        action["z"] = float.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        foreach (string s in PhysicsController.objectIdsInBox) {
+                            Debug.Log(s);
+                        }
+                        break;
                     }
-                    break;
-                }
 
                 // move ahead
-                case "mg":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveGlobal";
-                    action["x"] = float.Parse(splitcommand[1]);
-                    action["z"] = float.Parse(splitcommand[2]);
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "mg": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveGlobal";
+                        action["x"] = float.Parse(splitcommand[1]);
+                        action["z"] = float.Parse(splitcommand[2]);
 
-                case "move":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "Move",
-                        ["ahead"] = 0.25f
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "rotate":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "Rotate",
-                        ["degrees"] = 90
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "move": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "Move",
+                            ["ahead"] = 0.25f
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "stretchmovebaseup":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmBaseUp";
-                    action["distance"] = 0.05f;
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
+                case "rotate": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "Rotate",
+                            ["degrees"] = 90
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "stretchmovebaseup": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseUp";
+                        action["distance"] = 0.05f;
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
+
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "stretchmovebasedown":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmBaseUp";
-                    action["distance"] = -0.05f;
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
+                case "stretchmovebasedown": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseUp";
+                        action["distance"] = -0.05f;
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
 
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move ahead
-                case "ma":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveAhead";
-                    action["speed"] = 0.14f;
-                    action["acceleration"] = 0.14f;
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.25f;
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "ma": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveAhead";
+                        action["speed"] = 0.14f;
+                        action["acceleration"] = 0.14f;
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.25f;
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move backward
-                case "mb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveBack";
-                    action["speed"] = 0.14f;
-                    action["acceleration"] = 0.14f;
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.25f;
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "mb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveBack";
+                        action["speed"] = 0.14f;
+                        action["acceleration"] = 0.14f;
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.25f;
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move left
-                case "ml":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveLeft";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.25f;
+                case "ml": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveLeft";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.25f;
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // move right
-                case "mr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveRight";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.25f;
+                case "mr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveRight";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.25f;
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // move ahead, force action true
-                case "maf":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveAhead";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.moveMagnitude = 0.25f;
-                    }
+                case "maf": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveAhead";
+
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        } else {
+                            action.moveMagnitude = 0.25f;
+                        }
 
-                    action.forceAction = true;
+                        action.forceAction = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
                 // move backward, force action true
-                case "mbf":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveBack";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.moveMagnitude = 0.25f;
-                    }
+                case "mbf": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveBack";
+
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        } else {
+                            action.moveMagnitude = 0.25f;
+                        }
 
-                    action.forceAction = true;
+                        action.forceAction = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move left, force action true
-                case "mlf":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveLeft";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.moveMagnitude = 0.25f;
-                    }
+                case "mlf": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveLeft";
+
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        } else {
+                            action.moveMagnitude = 0.25f;
+                        }
 
-                    action.forceAction = true;
+                        action.forceAction = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move right, force action true
-                case "mrf":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveRight";
+                case "mrf": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveRight";
+
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        } else {
+                            action.moveMagnitude = 0.25f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.moveMagnitude = 0.25f;
-                    }
+                        action.forceAction = true;
 
-                    action.forceAction = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fu": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyUp";
+                        action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "fu":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyUp";
-                    action["moveMagnitude"] = 2f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fd": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyDown";
+                        action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "fd":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyDown";
-                    action["moveMagnitude"] = 2f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fa": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyAhead";
+                        action["moveMagnitude"] = 2f;
 
-                case "fa":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyAhead";
-                    action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "fl": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyLeft";
+                        action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "fl":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyLeft";
-                    action["moveMagnitude"] = 2f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyRight";
+                        action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "fr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyRight";
-                    action["moveMagnitude"] = 2f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "FlyBack";
+                        action["moveMagnitude"] = 2f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "fb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "FlyBack";
-                    action["moveMagnitude"] = 2f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "ll": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "LookLeft";
 
-                case "ll":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "LookLeft";
+                        if (splitcommand.Length > 1) {
+                            action["degrees"] = float.Parse(splitcommand[1]);
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["degrees"] = float.Parse(splitcommand[1]);
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // look up
-                case "lu":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "LookUp";
+                case "lu": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "LookUp";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["degrees"] = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action["degrees"] = float.Parse(splitcommand[1]);
+                        }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // stochastic look up
-                case "lus":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "LookUp";
+                case "lus": {
+                        ServerAction action = new ServerAction();
+                        action.action = "LookUp";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.degrees = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.degrees = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // look down
-                case "ld":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "LookDown";
+                case "ld": {
+                        ServerAction action = new ServerAction();
+                        action.action = "LookDown";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.degrees = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.degrees = float.Parse(splitcommand[1]);
+                        }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // stochastic look down
-                case "lds":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "LookDown";
+                case "lds": {
+                        ServerAction action = new ServerAction();
+                        action.action = "LookDown";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.degrees = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.degrees = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // rotate left
-                case "rl":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateLeft";
-                    action["speed"] = 22.5f;
-                    action["acceleration"] = 22.5f;
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["degrees"] = float.Parse(splitcommand[1]);
-                    }
+                case "rl": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateLeft";
+                        action["speed"] = 22.5f;
+                        action["acceleration"] = 22.5f;
+
+                        if (splitcommand.Length > 1) {
+                            action["degrees"] = float.Parse(splitcommand[1]);
+                        }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // rotate left stochastic
-                case "rls":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RotateLeft";
+                case "rls": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RotateLeft";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.degrees = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.degrees = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // rotate right
-                case "rr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateRight";
-                    action["speed"] = 22.5f;
-                    action["acceleration"] = 22.5f;
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["degrees"] = float.Parse(splitcommand[1]);
-                    }
+                case "rr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateRight";
+                        action["speed"] = 22.5f;
+                        action["acceleration"] = 22.5f;
+
+                        if (splitcommand.Length > 1) {
+                            action["degrees"] = float.Parse(splitcommand[1]);
+                        }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // rotate right stochastic
-                case "rrs":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RotateRight";
+                case "rrs": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RotateRight";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.degrees = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.degrees = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // rotate wrist absolute
-                case "rw":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateWrist";
-                    action["disableRendering"] = false;
+                case "rw": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateWrist";
+                        action["disableRendering"] = false;
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["yaw"] = float.Parse(splitcommand[1]);
-                    }
+                        if (splitcommand.Length > 1) {
+                            action["yaw"] = float.Parse(splitcommand[1]);
+                        }
 
-                    // action.manualInteract = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        // action.manualInteract = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // pickup object
-                case "pu":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PickupObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
+                case "pu": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PickupObject";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // Force pickup object
-                case "fpu":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PickupObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
+                case "fpu": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PickupObject";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        }
+                        action["forceAction"] = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action["forceAction"] = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
                 // pickup using screen coordinates
-                case "puxy":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PickupObject";
-                    // action.forceAction = true;
-                    action["x"] = 0.5f;
-                    action["y"] = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "slice":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SliceObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                case "puxy": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PickupObject";
+                        // action.forceAction = true;
+                        action["x"] = 0.5f;
+                        action["y"] = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "break":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "BreakObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                case "slice": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SliceObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action.x = 0.5f;
-                    action.y = 0.5f;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "break": {
+                        ServerAction action = new ServerAction();
+                        action.action = "BreakObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
+                        action.x = 0.5f;
+                        action.y = 0.5f;
 
-                case "dirtyobject":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DirtyObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "dirtyrec":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MakeReceptacleDirty";
-                    action["density"] = 0.1f;
-                    action["scale"] = new Vector3(0.3f, 0.3f, 0.2f);
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    if (splitcommand.Length > 2)
-                    {
-                        action["density"] = float.Parse(splitcommand[1]);
+
+                case "dirtyobject": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DirtyObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "dirtyrec": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MakeReceptacleDirty";
+                        action["density"] = 0.1f;
+                        action["scale"] = new Vector3(0.3f, 0.3f, 0.2f);
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        }
+                        if (splitcommand.Length > 2) {
+                            action["density"] = float.Parse(splitcommand[1]);
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "cleanobject":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "CleanObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        action.objectId = closestVisibleObjectId();
+                case "cleanobject": {
+                        ServerAction action = new ServerAction();
+                        action.action = "CleanObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        } else {
+                            action.objectId = closestVisibleObjectId();
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fillwater": {
+                        ServerAction action = new ServerAction();
+                        action.action = "FillObjectWithLiquid";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        } else {
+                            action.objectId = closestVisibleObjectId();
+                        }
 
-                case "fillwater":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "FillObjectWithLiquid";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
-                    else
-                    {
-                        action.objectId = closestVisibleObjectId();
+                        action.fillLiquid = "water";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action.fillLiquid = "water";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "fillcoffee": {
+                        ServerAction action = new ServerAction();
+                        action.action = "FillObjectWithLiquid";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        } else {
+                            action.objectId = closestVisibleObjectId();
+                        }
 
-                case "fillcoffee":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "FillObjectWithLiquid";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
-                    else
-                    {
-                        action.objectId = closestVisibleObjectId();
+                        action.fillLiquid = "coffee";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action.fillLiquid = "coffee";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // map view props
-                case "mvp":
-                {
-                    var action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "GetMapViewCameraProperties"
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "fillwine":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "FillObjectWithLiquid";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
-                    else
-                    {
-                        action.objectId = closestVisibleObjectId();
+                case "mvp": {
+                        var action = new Dictionary<string, object>() {
+                            ["action"] = "GetMapViewCameraProperties"
+                        };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action.fillLiquid = "wine";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "emptyliquid":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "EmptyLiquidFromObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                case "fillwine": {
+                        ServerAction action = new ServerAction();
+                        action.action = "FillObjectWithLiquid";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        } else {
+                            action.objectId = closestVisibleObjectId();
+                        }
+
+                        action.fillLiquid = "wine";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        action.objectId = closestVisibleObjectId();
+                case "emptyliquid": {
+                        ServerAction action = new ServerAction();
+                        action.action = "EmptyLiquidFromObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        } else {
+                            action.objectId = closestVisibleObjectId();
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "useup": {
+                        ServerAction action = new ServerAction();
+                        action.action = "UseUpObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                case "useup":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "UseUpObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // drop object
-                case "dr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "DropHeldObject";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "dr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "DropHeldObject";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // force drop object
-                case "fdr":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DropHandObject";
-                    action.forceAction = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                // rotate object in hand, pass in desired x/y/z rotation
-                case "ro":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RotateHand";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.x = float.Parse(splitcommand[1]);
-                        action.y = float.Parse(splitcommand[2]);
-                        action.z = float.Parse(splitcommand[3]);
+                case "fdr": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DropHandObject";
+                        action.forceAction = true;
                         CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    break;
-                }
+                // rotate object in hand, pass in desired x/y/z rotation
+                case "ro": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RotateHand";
+                        if (splitcommand.Length > 1) {
+                            action.x = float.Parse(splitcommand[1]);
+                            action.y = float.Parse(splitcommand[2]);
+                            action.z = float.Parse(splitcommand[3]);
+                            CurrentActiveController().ProcessControlCommand(action);
+                        }
 
-                case "ror":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "RotateHandRelative";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.x = float.Parse(splitcommand[1]);
-                        action.y = float.Parse(splitcommand[2]);
-                        action.z = float.Parse(splitcommand[3]);
-                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    break;
-                }
+                case "ror": {
+                        ServerAction action = new ServerAction();
+                        action.action = "RotateHandRelative";
+                        if (splitcommand.Length > 1) {
+                            action.x = float.Parse(splitcommand[1]);
+                            action.y = float.Parse(splitcommand[2]);
+                            action.z = float.Parse(splitcommand[3]);
+                            CurrentActiveController().ProcessControlCommand(action);
+                        }
+
+                        break;
+                    }
 
                 // default the Hand's position and rotation to the starting position and rotation
-                case "dh":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DefaultAgentHand";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "dh": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DefaultAgentHand";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "tta":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "TouchThenApplyForce";
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    action.handDistance = 2.0f;
-                    action.direction = new Vector3(0, 0, 1);
-                    action.moveMagnitude = 800f;
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "tta": {
+                        ServerAction action = new ServerAction();
+                        action.action = "TouchThenApplyForce";
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        action.handDistance = 2.0f;
+                        action.direction = new Vector3(0, 0, 1);
+                        action.moveMagnitude = 800f;
 
-                // rotate wrist right
-                case "rwr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateWristRelative";
-                    action["yaw"] = 90f;
-                    if (splitcommand.Length > 1)
-                    {
-                        action["yaw"] = float.Parse(splitcommand[1]);
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                // rotate wrist right
+                case "rwr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateWristRelative";
+                        action["yaw"] = 90f;
+                        if (splitcommand.Length > 1) {
+                            action["yaw"] = float.Parse(splitcommand[1]);
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move hand ahead, forward relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mha":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandAhead";
-
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
-                    }
+                case "mha": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandAhead";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    // action.x = 0f;
-                    // action.y = 0f;
-                    // action.z = 1f;
+                        // action.x = 0f;
+                        // action.y = 0f;
+                        // action.z = 1f;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move hand backward. relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mhb":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandBack";
+                case "mhb": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandBack";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
+                        // action.x = 0f;
+                        // action.y = 0f;
+                        // action.z = -1f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.x = 0f;
-                    // action.y = 0f;
-                    // action.z = -1f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // move hand left, relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mhl":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandLeft";
+                case "mhl": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandLeft";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
+                        // action.x = -1f;
+                        // action.y = 0f;
+                        // action.z = 0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.x = -1f;
-                    // action.y = 0f;
-                    // action.z = 0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // move hand right, relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mhr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandRight";
+                case "mhr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandRight";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
+                        // action.x = 1f;
+                        // action.y = 0f;
+                        // action.z = 0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.x = 1f;
-                    // action.y = 0f;
-                    // action.z = 0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // do nothing action
                 case "pass":
                 case "done":
-                case "noop":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "NoOp";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "noop": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "NoOp";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // Short circuiting exception test
-                case "sc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "OpenObject";
-                    action["x"] = 1.5;
-                    action["y"] = 0.5;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "sc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "OpenObject";
+                        action["x"] = 1.5;
+                        action["y"] = 0.5;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // move hand up, relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mhu":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandUp";
+                case "mhu": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandUp";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
+                        // action.x = 0f;
+                        // action.y = 1f;
+                        // action.z = 0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.x = 0f;
-                    // action.y = 1f;
-                    // action.z = 0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // move hand down, relative to agent's facing
                 // pass in move magnitude or default is 0.25 units
-                case "mhd":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveHandDown";
+                case "mhd": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveHandDown";
+
+                        if (splitcommand.Length > 1) {
+                            action["moveMagnitude"] = float.Parse(splitcommand[1]);
+                        } else {
+                            action["moveMagnitude"] = 0.1f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["moveMagnitude"] = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action["moveMagnitude"] = 0.1f;
+                        // action.x = 0f;
+                        // action.y = -1f;
+                        // action.z = 0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.x = 0f;
-                    // action.y = -1f;
-                    // action.z = 0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // changes the time spent to decay to room temperature for all objects in this scene of given type
-                case "DecayTimeForType":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetRoomTempDecayTimeForType";
+                case "DecayTimeForType": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetRoomTempDecayTimeForType";
 
-                    action["TimeUntilRoomTemp"] = 20f;
-                    action["objectType"] = "Bread";
-                    CurrentActiveController().ProcessControlCommand(action);
+                        action["TimeUntilRoomTemp"] = 20f;
+                        action["objectType"] = "Bread";
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
                 // changes the time spent to decay to room temperature for all objects globally in the scene
-                case "DecayTimeGlobal":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SetGlobalRoomTempDecayTime";
+                case "DecayTimeGlobal": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SetGlobalRoomTempDecayTime";
 
-                    action.TimeUntilRoomTemp = 20f;
-                    CurrentActiveController().ProcessControlCommand(action);
+                        action.TimeUntilRoomTemp = 20f;
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "SetTempDecayBool":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetDecayTemperatureBool";
+                case "SetTempDecayBool": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetDecayTemperatureBool";
 
-                    action["allowDecayTemperature"] = false;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        action["allowDecayTemperature"] = false;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // throw object by dropping it and applying force.
                 // default is with strength of 120, can pass in custom magnitude of throw force
-                case "throw":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ThrowObject";
+                case "throw": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ThrowObject";
+
+                        if (splitcommand.Length > 1) {
+                            action.moveMagnitude = float.Parse(splitcommand[1]);
+                        } else {
+                            action.moveMagnitude = 120f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.moveMagnitude = float.Parse(splitcommand[1]);
-                    }
-                    else
-                    {
-                        action.moveMagnitude = 120f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "push": {
+                        ServerAction action = new ServerAction();
+                        action.action = "PushObject";
 
-                case "push":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "PushObject";
+                        action.moveMagnitude = 2000f;
 
-                    action.moveMagnitude = 2000f;
+                        if (splitcommand.Length > 1 && splitcommand.Length < 3) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = 200f; // 4000f;
+                        } else if (splitcommand.Length > 2) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = float.Parse(splitcommand[2]);
+                        }
 
-                    if (splitcommand.Length > 1 && splitcommand.Length < 3)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = 200f; // 4000f;
-                    }
-                    else if (splitcommand.Length > 2)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = float.Parse(splitcommand[2]);
-                    }
+                        action.x = 0.5f;
+                        action.y = 0.5f;
 
-                    action.x = 0.5f;
-                    action.y = 0.5f;
+                        action.z = 1;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    action.z = 1;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "pull": {
+                        ServerAction action = new ServerAction();
+                        action.action = "PullObject";
 
-                case "pull":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "PullObject";
+                        action.moveMagnitude = 2000f;
 
-                    action.moveMagnitude = 2000f;
+                        if (splitcommand.Length > 1 && splitcommand.Length < 3) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = 200f; // 4000f;
+                        } else if (splitcommand.Length > 2) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = float.Parse(splitcommand[2]);
+                        } else {
+                            action.objectId = (
+                                (PhysicsRemoteFPSAgentController)AManager.PrimaryAgent
+                            ).ObjectIdOfClosestPickupableOrMoveableObject();
+                        }
 
-                    if (splitcommand.Length > 1 && splitcommand.Length < 3)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = 200f; // 4000f;
-                    }
-                    else if (splitcommand.Length > 2)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = float.Parse(splitcommand[2]);
-                    }
-                    else
-                    {
-                        action.objectId = (
-                            (PhysicsRemoteFPSAgentController)AManager.PrimaryAgent
-                        ).ObjectIdOfClosestPickupableOrMoveableObject();
+                        // action.moveMagnitude = 200f;// 4000f;
+                        action.z = -1;
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    // action.moveMagnitude = 200f;// 4000f;
-                    action.z = -1;
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "dirpush": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DirectionalPush";
 
-                case "dirpush":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DirectionalPush";
+                        if (splitcommand.Length > 1 && splitcommand.Length < 3) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = 10f; // 4000f;
+                        } else if (splitcommand.Length > 2) {
+                            action.objectId = splitcommand[1];
+                            action.moveMagnitude = float.Parse(splitcommand[2]);
+                        }
 
-                    if (splitcommand.Length > 1 && splitcommand.Length < 3)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = 10f; // 4000f;
-                    }
-                    else if (splitcommand.Length > 2)
-                    {
-                        action.objectId = splitcommand[1];
-                        action.moveMagnitude = float.Parse(splitcommand[2]);
+                        action.pushAngle = 279f;
+                        action.moveMagnitude = 159f;
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action.pushAngle = 279f;
-                    action.moveMagnitude = 159f;
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "toggleon": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ToggleObjectOn";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        } else {
+                            action["x"] = 0.5f;
+                            action["y"] = 0.5f;
+                        }
 
-                case "toggleon":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ToggleObjectOn";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else
-                    {
-                        action["x"] = 0.5f;
-                        action["y"] = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                case "toggleoff": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ToggleObjectOff";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        } else {
+                            action["x"] = 0.5f;
+                            action["y"] = 0.5f;
+                        }
 
-                    break;
-                }
+                        // action.objectId = "DeskLamp|-01.32|+01.24|-00.99";
+                        action["forceVisible"] = true;
+                        action["forceAction"] = true;
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                case "toggleoff":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ToggleObjectOff";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else
-                    {
-                        action["x"] = 0.5f;
-                        action["y"] = 0.5f;
+                        break;
                     }
 
-                    // action.objectId = "DeskLamp|-01.32|+01.24|-00.99";
-                    action["forceVisible"] = true;
-                    action["forceAction"] = true;
-                    CurrentActiveController().ProcessControlCommand(action);
+                case "cook": {
+                        ServerAction action = new ServerAction();
+                        action.action = "CookObject";
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    break;
-                }
+                        action.x = 0.5f;
+                        action.y = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                case "cook":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "CookObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
+                        break;
                     }
 
-                    action.x = 0.5f;
-                    action.y = 0.5f;
-                    CurrentActiveController().ProcessControlCommand(action);
-
-                    break;
-                }
-
-                case "sos":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SetObjectStates";
-                    action.SetObjectStates = new SetObjectStates()
-                    {
-                        stateChange = "toggleable",
-                        objectType = "DeskLamp",
-                        isToggled = false
-                    };
+                case "sos": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SetObjectStates";
+                        action.SetObjectStates = new SetObjectStates() {
+                            stateChange = "toggleable",
+                            objectType = "DeskLamp",
+                            isToggled = false
+                        };
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "pose":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SetObjectPoses";
-                    action.objectPoses = new ObjectPose[1];
+                case "pose": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SetObjectPoses";
+                        action.objectPoses = new ObjectPose[1];
 
-                    action.objectPoses[0] = new ObjectPose();
+                        action.objectPoses[0] = new ObjectPose();
 
-                    action.objectPoses[0].objectName = "Book_3d15d052";
-                    action.objectPoses[0].position = new Vector3(0, 0, 0);
-                    action.objectPoses[0].rotation = new Vector3(0, 0, 0);
+                        action.objectPoses[0].objectName = "Book_3d15d052";
+                        action.objectPoses[0].position = new Vector3(0, 0, 0);
+                        action.objectPoses[0].rotation = new Vector3(0, 0, 0);
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
                 // opens given object the given percent, default is 100% open
                 // open <object ID> percent
-                case "open":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "OpenObject";
-                    action["forceAction"] = true;
-
-                    if (splitcommand.Length == 1)
-                    {
-                        // try opening object in front of the agent
-                        action["openness"] = 0.5f;
-                        action["x"] = 0.5f;
-                        action["y"] = 0.5f;
-                    }
-                    else if (splitcommand.Length == 2)
-                    {
-                        // default open 100%
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        // give the open percentage as 3rd param, from 0.0 to 1.0
-                        action["objectId"] = splitcommand[1];
-                        action["openness"] = float.Parse(splitcommand[2]);
+                case "open": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "OpenObject";
+                        action["forceAction"] = true;
+
+                        if (splitcommand.Length == 1) {
+                            // try opening object in front of the agent
+                            action["openness"] = 0.5f;
+                            action["x"] = 0.5f;
+                            action["y"] = 0.5f;
+                        } else if (splitcommand.Length == 2) {
+                            // default open 100%
+                            action["objectId"] = splitcommand[1];
+                        } else if (splitcommand.Length == 3) {
+                            // give the open percentage as 3rd param, from 0.0 to 1.0
+                            action["objectId"] = splitcommand[1];
+                            action["openness"] = float.Parse(splitcommand[2]);
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "openim": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "OpenObjectImmediate";
 
-                case "openim":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "OpenObjectImmediate";
+                        action["objectId"] = "Cabinet|-00.73|+02.02|-02.46";
 
-                    action["objectId"] = "Cabinet|-00.73|+02.02|-02.46";
+                        action["openness"] = 1f;
 
-                    action["openness"] = 1f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "closeim": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "OpenObjectImmediate";
 
-                case "closeim":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "OpenObjectImmediate";
+                        action["objectId"] = "Cabinet|-00.73|+02.02|-02.46";
 
-                    action["objectId"] = "Cabinet|-00.73|+02.02|-02.46";
+                        action["openness"] = 0f;
 
-                    action["openness"] = 0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "close": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "CloseObject";
 
-                case "close":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "CloseObject";
+                        if (splitcommand.Length > 1) {
+                            action["objectId"] = splitcommand[1];
+                        } else {
+                            action["x"] = 0.5f;
+                            action["y"] = 0.5f;
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else
-                    {
-                        action["x"] = 0.5f;
-                        action["y"] = 0.5f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
                 // pass in object id of a receptacle, and this will report any other sim objects inside of it
                 // this works for cabinets, drawers, countertops, tabletops, etc.
-                case "contains":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "Contains";
+                case "contains": {
+                        ServerAction action = new ServerAction();
+                        action.action = "Contains";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
+                        break;
+                    }
 
                 //*****************************************************************************
                 // MASS SCALE ACTIONS HERE
                 //*****************************************************************************
 
                 // get total mass in right scale of MassScale sim obj
-                case "rscalemass":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MassInRightScale";
+                case "rscalemass": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MassInRightScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // get total mass in left scale of MassScale sim obj
-                case "lscalemass":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MassInLeftScale";
+                case "lscalemass": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MassInLeftScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // get total count of objects in right scale of MassScale sim obj
-                case "rscalecount":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "CountInRightScale";
+                case "rscalecount": {
+                        ServerAction action = new ServerAction();
+                        action.action = "CountInRightScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // get total count of objects in the left scale of MassScale sim obj
-                case "lscalecount":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "CountInLeftScale";
+                case "lscalecount": {
+                        ServerAction action = new ServerAction();
+                        action.action = "CountInLeftScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // get list of all sim objects in the right scale of MassScale sim obj
-                case "rscaleobjs":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ObjectsInRightScale";
+                case "rscaleobjs": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ObjectsInRightScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
                 // get list of all sim objects in the Left scale of MassScale sim obj
-                case "lscaleobjs":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "ObjectsInLeftScale";
+                case "lscaleobjs": {
+                        ServerAction action = new ServerAction();
+                        action.action = "ObjectsInLeftScale";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action.objectId = splitcommand[1];
-                    }
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        if (splitcommand.Length > 1) {
+                            action.objectId = splitcommand[1];
+                        }
 
-                // Will fail if navmeshes are not setup
-                case "expact":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ObjectNavExpertAction";
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length == 2)
-                    {
-                        // ID of spawner
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else if (splitcommand.Length >= 4)
-                    {
-                        // Target position
-                        action["position"] = new Vector3(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3])
-                        );
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // Will fail if navmeshes are not setup
-                case "sp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetShortestPath";
-                    action["objectType"] = "Bowl";
-                    action["allowedError"] = 0.05f;
-                    //for spraybottle on FloorPlan_Train9_5
-                    //action["position"] = new Vector3(7.149451732635498f, 0.9009996652603146f, -2.4680588245391846f);
-
-                    //for bowl on FloorPlan_Train1_3
-                    action["position"] = new Vector3(
-                        5.039496421813965f,
-                        0.9009997248649597f,
-                        -3.127098560333252f
-                    );
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        action["objectId"] = splitcommand[1];
-
-                        if (splitcommand.Length == 5)
-                        {
+                case "expact": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ObjectNavExpertAction";
+
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length == 2) {
+                            // ID of spawner
+                            action["objectId"] = splitcommand[1];
+                        } else if (splitcommand.Length >= 4) {
+                            // Target position
                             action["position"] = new Vector3(
+                                float.Parse(splitcommand[1]),
                                 float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3]),
-                                float.Parse(splitcommand[4])
+                                float.Parse(splitcommand[3])
                             );
                         }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "shortest_test":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    var agentId = 1;
-                    if (splitcommand.Length == 2)
-                    {
-                        // ID of spawner
-                        agentId = int.Parse(splitcommand[1]);
+                // Will fail if navmeshes are not setup
+                case "sp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetShortestPath";
+                        action["objectType"] = "Bowl";
+                        action["allowedError"] = 0.05f;
+                        //for spraybottle on FloorPlan_Train9_5
+                        //action["position"] = new Vector3(7.149451732635498f, 0.9009996652603146f, -2.4680588245391846f);
+
+                        //for bowl on FloorPlan_Train1_3
+                        action["position"] = new Vector3(
+                            5.039496421813965f,
+                            0.9009997248649597f,
+                            -3.127098560333252f
+                        );
+
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            action["objectId"] = splitcommand[1];
+
+                            if (splitcommand.Length == 5) {
+                                action["position"] = new Vector3(
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3]),
+                                    float.Parse(splitcommand[4])
+                                );
+                            }
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    action["action"] = "GetShortestPath";
+                case "shortest_test": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        var agentId = 1;
+                        if (splitcommand.Length == 2) {
+                            // ID of spawner
+                            agentId = int.Parse(splitcommand[1]);
+                        }
+                        action["action"] = "GetShortestPath";
 
-                    action["objectId"] = "Apple|surface|2|0";
-                    action["position"] = new Vector3(x: 3.0f, y: 0.9009921550750732f, z: 1.75f);
-                    action["rotation"] = new Vector3(-0.0f, 0.0f, 0.0f);
-                    action["agentId"] = agentId;
+                        action["objectId"] = "Apple|surface|2|0";
+                        action["position"] = new Vector3(x: 3.0f, y: 0.9009921550750732f, z: 1.75f);
+                        action["rotation"] = new Vector3(-0.0f, 0.0f, 0.0f);
+                        action["agentId"] = agentId;
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
-                case "shortest_path_type":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetShortestPath";
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        action["objectType"] = splitcommand[1];
+                        break;
+                    }
+                case "shortest_path_type": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetShortestPath";
 
-                        if (splitcommand.Length == 5)
-                        {
-                            action["position"] = new Vector3(
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3]),
-                                float.Parse(splitcommand[4])
-                            );
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            action["objectType"] = splitcommand[1];
+
+                            if (splitcommand.Length == 5) {
+                                action["position"] = new Vector3(
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3]),
+                                    float.Parse(splitcommand[4])
+                                );
+                            }
                         }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "shortest_path_point": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetShortestPathToPoint";
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "shortest_path_point":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetShortestPathToPoint";
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        // action.objectId = splitcommand[1];
-
-                        if (splitcommand.Length == 4)
-                        {
-                            action["x"] = float.Parse(splitcommand[1]);
-                            action["y"] = float.Parse(splitcommand[2]);
-                            action["z"] = float.Parse(splitcommand[3]);
-                        }
-                        if (splitcommand.Length >= 7)
-                        {
-                            action["position"] = new Vector3(
-                                float.Parse(splitcommand[1]),
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3])
-                            );
-                            action["x"] = float.Parse(splitcommand[4]);
-                            action["y"] = float.Parse(splitcommand[5]);
-                            action["z"] = float.Parse(splitcommand[6]);
-                        }
-                        if (splitcommand.Length >= 8)
-                        {
-                            action["allowedError"] = float.Parse(splitcommand[7]);
-                        }
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            // action.objectId = splitcommand[1];
 
-                        if (splitcommand.Length < 4)
-                        {
+                            if (splitcommand.Length == 4) {
+                                action["x"] = float.Parse(splitcommand[1]);
+                                action["y"] = float.Parse(splitcommand[2]);
+                                action["z"] = float.Parse(splitcommand[3]);
+                            }
+                            if (splitcommand.Length >= 7) {
+                                action["position"] = new Vector3(
+                                    float.Parse(splitcommand[1]),
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3])
+                                );
+                                action["x"] = float.Parse(splitcommand[4]);
+                                action["y"] = float.Parse(splitcommand[5]);
+                                action["z"] = float.Parse(splitcommand[6]);
+                            }
+                            if (splitcommand.Length >= 8) {
+                                action["allowedError"] = float.Parse(splitcommand[7]);
+                            }
+
+                            if (splitcommand.Length < 4) {
+                                throw new ArgumentException(
+                                    "need to provide 6 floats, first 3 source position second 3 target position"
+                                );
+                            }
+                        } else {
                             throw new ArgumentException(
-                                "need to provide 6 floats, first 3 source position second 3 target position"
+                                "need to provide at least 3 floats for target position"
                             );
                         }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        throw new ArgumentException(
-                            "need to provide at least 3 floats for target position"
-                        );
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "shortest_path_p":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetShortestPathToPointN";
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        // action.objectId = splitcommand[1];
-
-                        if (splitcommand.Length >= 4)
-                        {
-                            var target = new Vector3(
-                                float.Parse(splitcommand[1]),
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3])
-                            );
-                            action["target"] = target;
-                        }
+                case "shortest_path_p": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetShortestPathToPointN";
 
-                        if (splitcommand.Length > 4)
-                        {
-                            action["allowedError"] = float.Parse(splitcommand[4]);
-                        }
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            // action.objectId = splitcommand[1];
 
-                        if (splitcommand.Length > 5)
-                        {
-                            action["agentId"] = int.Parse(splitcommand[5]);
-                        }
+                            if (splitcommand.Length >= 4) {
+                                var target = new Vector3(
+                                    float.Parse(splitcommand[1]),
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3])
+                                );
+                                action["target"] = target;
+                            }
 
-                        if (splitcommand.Length < 4)
-                        {
+                            if (splitcommand.Length > 4) {
+                                action["allowedError"] = float.Parse(splitcommand[4]);
+                            }
+
+                            if (splitcommand.Length > 5) {
+                                action["agentId"] = int.Parse(splitcommand[5]);
+                            }
+
+                            if (splitcommand.Length < 4) {
+                                throw new ArgumentException(
+                                    "need to provide 6 floats, first 3 source position second 3 target position"
+                                );
+                            }
+                        } else {
                             throw new ArgumentException(
-                                "need to provide 6 floats, first 3 source position second 3 target position"
+                                "need to provide at least 3 floats for target position"
                             );
                         }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        throw new ArgumentException(
-                            "need to provide at least 3 floats for target position"
-                        );
-                    }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "visualize_path":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "VisualizePath",
-                        ["positions"] = new List<Vector3>()
-                        {
+                case "visualize_path": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "VisualizePath",
+                            ["positions"] = new List<Vector3>()
+                            {
                             new Vector3(4.258f, 1.0f, -1.69f),
                             new Vector3(6.3f, 1.0f, -3.452f)
                         }
-                    };
+                        };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "visualize_path2":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "VisualizePath",
-                        ["positions"] = new List<Vector3>()
-                        {
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "visualize_path2": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "VisualizePath",
+                            ["positions"] = new List<Vector3>()
+                            {
                             new Vector3(4.258f, 1.0f, -1.69f),
                             new Vector3(8.3f, 1.0f, 3.452f)
                         }
-                    };
+                        };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "hide_path":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>()
-                    {
-                        ["action"] = "HideVisualizedPath"
-                    };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "hide_path": {
+                        Dictionary<string, object> action = new Dictionary<string, object>() {
+                            ["action"] = "HideVisualizedPath"
+                        };
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "vp":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "VisualizeShortestPaths";
+                case "vp": {
+                        ServerAction action = new ServerAction();
+                        action.action = "VisualizeShortestPaths";
 
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        action.objectType = splitcommand[1];
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            action.objectType = splitcommand[1];
 
-                        if (splitcommand.Length == 5)
-                        {
-                            action.position = new Vector3(
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3]),
-                                float.Parse(splitcommand[4])
-                            );
-                        }
-                        else
-                        {
-                            var pos = PhysicsController.getReachablePositions().Shuffle();
-                            action.positions = pos.Take(20).ToList();
-                            action.grid = true;
-                            // action.pathGradient = new Gradient() {
-                            //     colorKeys = new GradientColorKey[]{
-                            //          new GradientColorKey(Color.white, 0.0f),
-                            //          new GradientColorKey(Color.blue, 1.0f)
-                            //         },
-                            //     alphaKeys =  new GradientAlphaKey[]{
-                            //         new GradientAlphaKey(1.0f, 0.0f),
-                            //         new GradientAlphaKey(1.0f, 1.0f)
-                            //     },
-                            //     mode = GradientMode.Blend
-                            // };
-                            // action.gridColor = new Color(1.0f, 0.0f, 0.0f, 1.0f);
-                            // action.positions = new List<Vector3>() {
-                            //     new Vector3( 4.258f, 1.0f, -2.69f),
-                            //     new Vector3(4.3f, 1.0f, -3.452f)
-                            // };
+                            if (splitcommand.Length == 5) {
+                                action.position = new Vector3(
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3]),
+                                    float.Parse(splitcommand[4])
+                                );
+                            } else {
+                                var pos = PhysicsController.getReachablePositions().Shuffle();
+                                action.positions = pos.Take(20).ToList();
+                                action.grid = true;
+                                // action.pathGradient = new Gradient() {
+                                //     colorKeys = new GradientColorKey[]{
+                                //          new GradientColorKey(Color.white, 0.0f),
+                                //          new GradientColorKey(Color.blue, 1.0f)
+                                //         },
+                                //     alphaKeys =  new GradientAlphaKey[]{
+                                //         new GradientAlphaKey(1.0f, 0.0f),
+                                //         new GradientAlphaKey(1.0f, 1.0f)
+                                //     },
+                                //     mode = GradientMode.Blend
+                                // };
+                                // action.gridColor = new Color(1.0f, 0.0f, 0.0f, 1.0f);
+                                // action.positions = new List<Vector3>() {
+                                //     new Vector3( 4.258f, 1.0f, -2.69f),
+                                //     new Vector3(4.3f, 1.0f, -3.452f)
+                                // };
+                            }
                         }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "vpf": {
+                        ServerAction action = new ServerAction();
+                        action.action = "VisualizeShortestPaths";
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "vpf":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "VisualizeShortestPaths";
+                        action.objectType = "Dog Bed";
 
-                    action.objectType = "Dog Bed";
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            action.objectType = splitcommand[1];
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        action.objectType = splitcommand[1];
-                    }
+                        Debug.Log($"vpf --- call {splitcommand.Length}");
 
-                    Debug.Log($"vpf --- call {splitcommand.Length}");
+                        var fpin = CurrentActiveController() as FpinAgentController;
+                        var pos = fpin.SamplePointsOnNavMesh(200, 0.1f);
+                        action.positions = pos.Take(20).ToList();
 
-                    var fpin = CurrentActiveController() as FpinAgentController;
-                    var pos = fpin.SamplePointsOnNavMesh(200, 0.1f);
-                    action.positions = pos.Take(20).ToList();
+                        Debug.Log(
+                            $"Debug input field {action.positions} null? {action.positions == null}"
+                        );
+                        action.grid = true;
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    Debug.Log(
-                        $"Debug input field {action.positions} null? {action.positions == null}"
-                    );
-                    action.grid = true;
-                    CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "vw": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "VisualizeWaypoints";
 
-                    break;
-                }
-                case "vw":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "VisualizeWaypoints";
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            var num = int.Parse(splitcommand[1]);
 
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        var num = int.Parse(splitcommand[1]);
+                            var pos = PhysicsController.getReachablePositions().Shuffle();
+                            var positions = pos.Take(num).ToList();
 
-                        var pos = PhysicsController.getReachablePositions().Shuffle();
-                        var positions = pos.Take(num).ToList();
+                            action["waypoints"] = positions.Select(p => new Waypoint() {
+                                position = p,
+                                color = SerializableColor.fromUnityColor(UnityEngine.Random.ColorHSV()),
+                                radius = 0.5f
+                            });
+                            // action.pathGradient = new Gradient() {
+                            //     colorKeys = new GradientColorKey[]{
+                            //          new GradientColorKey(Color.white, 0.0f),
+                            //          new GradientColorKey(Color.blue, 1.0f)
+                            //         },
+                            //     alphaKeys =  new GradientAlphaKey[]{
+                            //         new GradientAlphaKey(1.0f, 0.0f),
+                            //         new GradientAlphaKey(1.0f, 1.0f)
+                            //     },
+                            //     mode = GradientMode.Blend
+                            // };
+                            // action.gridColor = new Color(1.0f, 0.0f, 0.0f, 1.0f);
+                            // action.positions = new List<Vector3>() {
+                            //     new Vector3( 4.258f, 1.0f, -2.69f),
+                            //     new Vector3(4.3f, 1.0f, -3.452f)
+                            // };=
+                        }
 
-                        action["waypoints"] = positions.Select(p => new Waypoint()
-                        {
-                            position = p,
-                            color = SerializableColor.fromUnityColor(UnityEngine.Random.ColorHSV()),
-                            radius = 0.5f
-                        });
-                        // action.pathGradient = new Gradient() {
-                        //     colorKeys = new GradientColorKey[]{
-                        //          new GradientColorKey(Color.white, 0.0f),
-                        //          new GradientColorKey(Color.blue, 1.0f)
-                        //         },
-                        //     alphaKeys =  new GradientAlphaKey[]{
-                        //         new GradientAlphaKey(1.0f, 0.0f),
-                        //         new GradientAlphaKey(1.0f, 1.0f)
-                        //     },
-                        //     mode = GradientMode.Blend
-                        // };
-                        // action.gridColor = new Color(1.0f, 0.0f, 0.0f, 1.0f);
-                        // action.positions = new List<Vector3>() {
-                        //     new Vector3( 4.258f, 1.0f, -2.69f),
-                        //     new Vector3(4.3f, 1.0f, -3.452f)
-                        // };=
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "visualize_shortest_path": {
+                        ServerAction action = new ServerAction();
+                        action.action = "VisualizeShortestPaths";
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "visualize_shortest_path":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "VisualizeShortestPaths";
-
-                    // pass in a min range, max range, delay
-                    if (splitcommand.Length > 1)
-                    {
-                        // ID of spawner
-                        action.objectType = splitcommand[1];
+                        // pass in a min range, max range, delay
+                        if (splitcommand.Length > 1) {
+                            // ID of spawner
+                            action.objectType = splitcommand[1];
 
-                        if (splitcommand.Length == 5)
-                        {
-                            action.position = new Vector3(
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3]),
-                                float.Parse(splitcommand[4])
-                            );
-                        }
-                        else
-                        {
-                            // var pos = PhysicsController.getReachablePositions().Shuffle();
-                            action.positions = new List<Vector3>()
-                            {
+                            if (splitcommand.Length == 5) {
+                                action.position = new Vector3(
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3]),
+                                    float.Parse(splitcommand[4])
+                                );
+                            } else {
+                                // var pos = PhysicsController.getReachablePositions().Shuffle();
+                                action.positions = new List<Vector3>()
+                                {
                                 PhysicsController.transform.position
                             };
-                            action.grid = true;
+                                action.grid = true;
+                            }
                         }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "get_object_type_ids": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ObjectTypeToObjectIds";
+                        if (splitcommand.Length > 1) {
+                            action["objectType"] = splitcommand[1];
+                        }
 
-                case "get_object_type_ids":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ObjectTypeToObjectIds";
-                    if (splitcommand.Length > 1)
-                    {
-                        action["objectType"] = splitcommand[1];
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
                 case "move_mid_arm":
-                case "mmla":
-                {
-                    // Limit around -0.084
-                    //"mmla 0 0 0.08 0.1 false wrist true"
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveMidLevelArm";
-                    action.speed = 1.0f;
-                    action.disableRendering = false;
-                    // action.returnToStart = true;
-                    if (splitcommand.Length > 4)
-                    {
-                        action.position = new Vector3(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3])
-                        );
+                case "mmla": {
+                        // Limit around -0.084
+                        //"mmla 0 0 0.08 0.1 false wrist true"
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveMidLevelArm";
+                        action.speed = 1.0f;
+                        action.disableRendering = false;
+                        // action.returnToStart = true;
+                        if (splitcommand.Length > 4) {
+                            action.position = new Vector3(
+                                float.Parse(splitcommand[1]),
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3])
+                            );
 
-                        if (splitcommand.Length >= 5)
-                        {
-                            action.speed = float.Parse(splitcommand[4]);
-                        }
+                            if (splitcommand.Length >= 5) {
+                                action.speed = float.Parse(splitcommand[4]);
+                            }
 
-                        if (splitcommand.Length >= 6)
-                        {
-                            action.coordinateSpace = splitcommand[5];
-                        }
+                            if (splitcommand.Length >= 6) {
+                                action.coordinateSpace = splitcommand[5];
+                            }
 
-                        if (splitcommand.Length >= 7)
-                        {
-                            action.returnToStart = bool.Parse(splitcommand[6]);
-                        }
+                            if (splitcommand.Length >= 7) {
+                                action.returnToStart = bool.Parse(splitcommand[6]);
+                            }
 
-                        if (splitcommand.Length >= 8)
-                        {
-                            action.restrictMovement = bool.Parse(splitcommand[7]);
-                        }
+                            if (splitcommand.Length >= 8) {
+                                action.restrictMovement = bool.Parse(splitcommand[7]);
+                            }
 
-                        if (splitcommand.Length >= 9)
-                        {
-                            action.disableRendering = bool.Parse(splitcommand[8]);
+                            if (splitcommand.Length >= 9) {
+                                action.disableRendering = bool.Parse(splitcommand[8]);
+                            }
+                        } else {
+                            Debug.LogError("Target x y z args needed for command");
                         }
+                        // action.stopArmMovementOnContact = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        Debug.LogError("Target x y z args needed for command");
-                    }
-                    // action.stopArmMovementOnContact = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // move mid level arm stop motion
-                case "mmlas":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "MoveMidLevelArm";
-                    action.speed = 1.0f;
-                    // action.returnToStart = true;
-                    if (splitcommand.Length > 4)
-                    {
-                        action.position = new Vector3(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3])
-                        );
+                case "mmlas": {
+                        ServerAction action = new ServerAction();
+                        action.action = "MoveMidLevelArm";
+                        action.speed = 1.0f;
+                        // action.returnToStart = true;
+                        if (splitcommand.Length > 4) {
+                            action.position = new Vector3(
+                                float.Parse(splitcommand[1]),
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3])
+                            );
 
-                        if (splitcommand.Length >= 5)
-                        {
-                            action.speed = float.Parse(splitcommand[4]);
-                        }
+                            if (splitcommand.Length >= 5) {
+                                action.speed = float.Parse(splitcommand[4]);
+                            }
 
-                        if (splitcommand.Length >= 6)
-                        {
-                            action.returnToStart = bool.Parse(splitcommand[5]);
-                        }
+                            if (splitcommand.Length >= 6) {
+                                action.returnToStart = bool.Parse(splitcommand[5]);
+                            }
 
-                        if (splitcommand.Length >= 7)
-                        {
-                            action.handCameraSpace = bool.Parse(splitcommand[6]);
+                            if (splitcommand.Length >= 7) {
+                                action.handCameraSpace = bool.Parse(splitcommand[6]);
+                            }
+                        } else {
+                            Debug.LogError("Target x y z args needed for command");
                         }
+                        action.stopArmMovementOnContact = true;
+                        // action.stopArmMovementOnContact = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        Debug.LogError("Target x y z args needed for command");
-                    }
-                    action.stopArmMovementOnContact = true;
-                    // action.stopArmMovementOnContact = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
                 // move mid level arm stop motion
-                case "mar":
-                {
-                    // ServerAction action = new ServerAction();
-                    // action.action = "MoveArmRelative";
-                    // action.speed = 1.0f;
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmRelative";
-                    action["speed"] = 1.0f;
-                    // action.returnToStart = true;
-                    if (splitcommand.Length >= 4)
-                    {
-                        Debug.Log("4 >");
-                        action["offset"] = new Vector3(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3])
-                        );
+                case "mar": {
+                        // ServerAction action = new ServerAction();
+                        // action.action = "MoveArmRelative";
+                        // action.speed = 1.0f;
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmRelative";
+                        action["speed"] = 1.0f;
+                        // action.returnToStart = true;
+                        if (splitcommand.Length >= 4) {
+                            Debug.Log("4 >");
+                            action["offset"] = new Vector3(
+                                float.Parse(splitcommand[1]),
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3])
+                            );
 
-                        if (splitcommand.Length >= 5)
-                        {
-                            action["speed"] = float.Parse(splitcommand[4]);
-                        }
+                            if (splitcommand.Length >= 5) {
+                                action["speed"] = float.Parse(splitcommand[4]);
+                            }
 
-                        if (splitcommand.Length >= 6)
-                        {
-                            action["returnToStart"] = bool.Parse(splitcommand[5]);
-                        }
+                            if (splitcommand.Length >= 6) {
+                                action["returnToStart"] = bool.Parse(splitcommand[5]);
+                            }
 
-                        if (splitcommand.Length >= 7)
-                        {
-                            action["coordinateSpace"] = bool.Parse(splitcommand[6]);
+                            if (splitcommand.Length >= 7) {
+                                action["coordinateSpace"] = bool.Parse(splitcommand[6]);
+                            }
+                        } else {
+                            Debug.LogError("Target x y z args needed for command");
                         }
+                        // action.stopArmMovementOnContact = true;
+                        // action.stopArmMovementOnContact = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else
-                    {
-                        Debug.LogError("Target x y z args needed for command");
+                case "pac": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "DebugMidLevelArmCollisions";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    // action.stopArmMovementOnContact = true;
-                    // action.stopArmMovementOnContact = true;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "pac":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "DebugMidLevelArmCollisions";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "mau":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmBaseUp";
-                    action["distance"] = 0.5f;
-                    action["speed"] = 1.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-
-                case "abmovebaseup":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmBaseUp";
-                    action["distance"] = 0.05f;
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
-
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "mau": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseUp";
+                        action["distance"] = 0.5f;
+                        action["speed"] = 1.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "abmovebasedown":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArmBaseDown";
-                    action["distance"] = 0.05f;
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
+                case "abmovebaseup": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseUp";
+                        action["distance"] = 0.05f;
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
 
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "abextendarm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArm";
-                    action["position"] = new Vector3(0, 0, 0.5f);
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
-                    action["useLimits"] = true;
+                case "abmovebasedown": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArmBaseDown";
+                        action["distance"] = 0.05f;
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["position"] = new Vector3(0, 0, float.Parse(splitcommand[1]));
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "abextendarm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArm";
+                        action["position"] = new Vector3(0, 0, 0.5f);
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
+                        action["useLimits"] = true;
 
-                case "abretractarm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveArm";
-                    action["position"] = new Vector3(0, 0, -0.5f);
-                    action["speed"] = 5.0f;
-                    action["disableRendering"] = false;
-                    action["useLimits"] = true;
+                        if (splitcommand.Length > 1) {
+                            action["position"] = new Vector3(0, 0, float.Parse(splitcommand[1]));
+                        }
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["position"] = new Vector3(0, 0, float.Parse(splitcommand[1]));
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "abretractarm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveArm";
+                        action["position"] = new Vector3(0, 0, -0.5f);
+                        action["speed"] = 5.0f;
+                        action["disableRendering"] = false;
+                        action["useLimits"] = true;
 
-                case "abrotatewrist":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateWristRelative";
-                    action["yaw"] = 90f;
-                    action["speed"] = 400f;
-                    action["disableRendering"] = false;
-                    //action["fixedDeltaTime"] = 5.0f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        if (splitcommand.Length > 1) {
+                            action["position"] = new Vector3(0, 0, float.Parse(splitcommand[1]));
+                        }
 
-                // manual pickup object- test hand
-                case "abpickup":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PickupObject";
-                    if (splitcommand.Length > 1)
-                    {
-                        List<string> objectIds = new List<string>();
-                        objectIds.Add(splitcommand[1]);
-                        action["objectIdCandidates"] = objectIds;
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
 
-                case "abdrop":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ReleaseObject";
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "abrotatewrist": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateWristRelative";
+                        action["yaw"] = 90f;
+                        action["speed"] = 400f;
+                        action["disableRendering"] = false;
+                        //action["fixedDeltaTime"] = 5.0f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "gcfr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetCoordinateFromRaycast";
-                    action["x"] = float.Parse(splitcommand[1]);
-                    action["y"] = float.Parse(splitcommand[2]);
+                // manual pickup object- test hand
+                case "abpickup": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PickupObject";
+                        if (splitcommand.Length > 1) {
+                            List<string> objectIds = new List<string>();
+                            objectIds.Add(splitcommand[1]);
+                            action["objectIdCandidates"] = objectIds;
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                case "abdrop": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ReleaseObject";
 
-                case "abtelefull":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "TeleportFull";
-                    action["position"] = new Vector3(7f, 0.95f, 6.4f);
-                    action["rotation"] = new Vector3(0f, 180f, 0f);
-                    action["horizon"] = -20f;
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "telefull":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "TeleportFull";
-                    action["x"] = -1f;
-                    action["y"] = 0.9009995460510254f;
-                    action["z"] = 1.5f;
-                    Vector3 rotation = new Vector3(0, 135.0f, 0);
-                    float horizon = Agent
-                        .GetComponent<BaseAgentComponent>()
-                        .AgentCamera.transform.eulerAngles.x;
-                    bool standing = true;
-
-                    if (splitcommand.Length > 1 && splitcommand.Length < 6)
-                    {
+                case "gcfr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetCoordinateFromRaycast";
                         action["x"] = float.Parse(splitcommand[1]);
                         action["y"] = float.Parse(splitcommand[2]);
-                        action["z"] = float.Parse(splitcommand[3]);
-                        rotation = new Vector3(0, float.Parse(splitcommand[4]), 0);
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else if (splitcommand.Length >= 6)
-                    {
-                        action["x"] = float.Parse(splitcommand[1]);
-                        action["y"] = float.Parse(splitcommand[2]);
-                        action["z"] = float.Parse(splitcommand[3]);
-                        rotation = new Vector3(0, float.Parse(splitcommand[4]), 0);
-                        horizon = float.Parse(splitcommand[5]);
+
+                case "abtelefull": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "TeleportFull";
+                        action["position"] = new Vector3(7f, 0.95f, 6.4f);
+                        action["rotation"] = new Vector3(0f, 180f, 0f);
+                        action["horizon"] = -20f;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
 
-                    action["rotation"] = rotation;
-                    action["horizon"] = horizon;
-                    action["standing"] = standing;
+                case "telefull": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "TeleportFull";
+                        action["x"] = -1f;
+                        action["y"] = 0.9009995460510254f;
+                        action["z"] = 1.5f;
+                        Vector3 rotation = new Vector3(0, 135.0f, 0);
+                        float horizon = Agent
+                            .GetComponent<BaseAgentComponent>()
+                            .AgentCamera.transform.eulerAngles.x;
+                        bool standing = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        if (splitcommand.Length > 1 && splitcommand.Length < 6) {
+                            action["x"] = float.Parse(splitcommand[1]);
+                            action["y"] = float.Parse(splitcommand[2]);
+                            action["z"] = float.Parse(splitcommand[3]);
+                            rotation = new Vector3(0, float.Parse(splitcommand[4]), 0);
+                        } else if (splitcommand.Length >= 6) {
+                            action["x"] = float.Parse(splitcommand[1]);
+                            action["y"] = float.Parse(splitcommand[2]);
+                            action["z"] = float.Parse(splitcommand[3]);
+                            rotation = new Vector3(0, float.Parse(splitcommand[4]), 0);
+                            horizon = float.Parse(splitcommand[5]);
+                        }
 
-                case "telearm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "TeleportArm";
+                        action["rotation"] = rotation;
+                        action["horizon"] = horizon;
+                        action["standing"] = standing;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
 
-                case "expfit":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "WhichContainersDoesAvailableObjectFitIn";
-                    action["objectName"] = "AlarmClock_dd21c3db";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "scale":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "ScaleObject";
-                    action["objectId"] = "Box|+00.00|+01.33|-00.44";
-                    action["scale"] = 0.6746510624885559f;
-                    action["scaleOverSeconds"] = 0f;
-                    action["forceAction"] = true;
+                case "telearm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "TeleportArm";
 
-                    if (splitcommand.Length > 1)
-                    {
-                        action["scale"] = float.Parse(splitcommand[1]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    if (splitcommand.Length > 2)
-                    {
-                        action["scaleOverSeconds"] = float.Parse(splitcommand[2]);
+
+                case "expfit": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "WhichContainersDoesAvailableObjectFitIn";
+                        action["objectName"] = "AlarmClock_dd21c3db";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "scale": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "ScaleObject";
+                        action["objectId"] = "Box|+00.00|+01.33|-00.44";
+                        action["scale"] = 0.6746510624885559f;
+                        action["scaleOverSeconds"] = 0f;
+                        action["forceAction"] = true;
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "closepoints":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PointOnObjectsCollidersClosestToPoint";
-                    action["objectId"] = "Dumbbell|+00.00|+00.90|+00.00";
-                    action["point"] = new Vector3(0f, 1000f, 0f);
-                    //action["objectId"] = "2|1";
-                    //action["point"] = new Vector3(13.569999694824219f, 0.8979997634887695f, 2.1710000038146973f);
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "mc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "MoveAgent";
-                    action["speed"] = 1;
-                    if (splitcommand.Length > 2)
-                    {
-                        action["ahead"] = float.Parse(splitcommand[1]);
-                        action["right"] = float.Parse(splitcommand[2]);
-
-                        if (splitcommand.Length > 3)
-                        {
-                            action["speed"] = float.Parse(splitcommand[3]);
+                        if (splitcommand.Length > 1) {
+                            action["scale"] = float.Parse(splitcommand[1]);
                         }
+                        if (splitcommand.Length > 2) {
+                            action["scaleOverSeconds"] = float.Parse(splitcommand[2]);
+                        }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
+                case "closepoints": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PointOnObjectsCollidersClosestToPoint";
+                        action["objectId"] = "Dumbbell|+00.00|+00.90|+00.00";
+                        action["point"] = new Vector3(0f, 1000f, 0f);
+                        //action["objectId"] = "2|1";
+                        //action["point"] = new Vector3(13.569999694824219f, 0.8979997634887695f, 2.1710000038146973f);
 
-                    action["physicsSimulationParams"] = new PhysicsSimulationParams()
-                    {
-                        autoSimulation = false
-                    };
-                    action["returnToStart"] = true;
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
+                    }
+                case "mc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "MoveAgent";
+                        action["speed"] = 1;
+                        if (splitcommand.Length > 2) {
+                            action["ahead"] = float.Parse(splitcommand[1]);
+                            action["right"] = float.Parse(splitcommand[2]);
 
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "rc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateAgent";
-                    // if (splitcommand.Length > 2) {
-                    action["degrees"] = float.Parse(splitcommand[1]);
-
-                    // if (splitcommand.Length >= 3) {
-                    //     action.speed = float.Parse(splitcommand[2]);
-                    // }
-
-                    // if (splitcommand.Length >= 4) {
-                    //     action.disableRendering = bool.Parse(splitcommand[3]);
-                    // }
-
-                    // if (splitcommand.Length >= 5) {
-                    //     action.returnToStart = bool.Parse(splitcommand[4]);
-                    // }
-                    // }
-
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                            if (splitcommand.Length > 3) {
+                                action["speed"] = float.Parse(splitcommand[3]);
+                            }
+                        }
 
-                default:
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["physicsSimulationParams"] = new PhysicsSimulationParams() {
+                            autoSimulation = false
+                        };
+                        action["returnToStart"] = true;
 
-                    action["action"] = splitcommand[0];
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1];
-                    }
-                    else if (splitcommand.Length == 3)
-                    {
-                        action["x"] = float.Parse(splitcommand[1]);
-                        action["z"] = float.Parse(splitcommand[2]);
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else if (splitcommand.Length == 4)
-                    {
-                        action["x"] = float.Parse(splitcommand[1]);
-                        action["y"] = float.Parse(splitcommand[2]);
-                        action["z"] = float.Parse(splitcommand[3]);
+                case "rc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateAgent";
+                        // if (splitcommand.Length > 2) {
+                        action["degrees"] = float.Parse(splitcommand[1]);
+
+                        // if (splitcommand.Length >= 3) {
+                        //     action.speed = float.Parse(splitcommand[2]);
+                        // }
+
+                        // if (splitcommand.Length >= 4) {
+                        //     action.disableRendering = bool.Parse(splitcommand[3]);
+                        // }
+
+                        // if (splitcommand.Length >= 5) {
+                        //     action.returnToStart = bool.Parse(splitcommand[4]);
+                        // }
+                        // }
+
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
-                    // Debug.Log("Invalid Command");
-                    break;
-                }
 
-                // rotate kinematic hand on arm
-                case "rmlh":
-                {
-                    ServerAction action = new ServerAction();
-
-                    action.action = "RotateMidLevelHand";
-
-                    if (splitcommand.Length > 4)
-                    {
-                        action.rotation = new Vector3(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3])
-                        );
+                default: {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                        if (splitcommand.Length >= 5)
-                        {
-                            action.speed = float.Parse(splitcommand[4]);
+                        action["action"] = splitcommand[0];
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1];
+                        } else if (splitcommand.Length == 3) {
+                            action["x"] = float.Parse(splitcommand[1]);
+                            action["z"] = float.Parse(splitcommand[2]);
+                        } else if (splitcommand.Length == 4) {
+                            action["x"] = float.Parse(splitcommand[1]);
+                            action["y"] = float.Parse(splitcommand[2]);
+                            action["z"] = float.Parse(splitcommand[3]);
                         }
+                        CurrentActiveController().ProcessControlCommand(action);
+                        // Debug.Log("Invalid Command");
+                        break;
                     }
 
-                    CurrentActiveController().ProcessControlCommand(action);
+                // rotate kinematic hand on arm
+                case "rmlh": {
+                        ServerAction action = new ServerAction();
 
-                    break;
-                }
+                        action.action = "RotateMidLevelHand";
 
-                case "pumlh":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "PickUpMidLevelHand";
-                    action["objectIds"] = new List<string>
-                    {
-                        "Bread|-00.52|+01.17|-00.03",
-                        "Apple|-00.54|+01.15|+00.18"
-                    };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                        if (splitcommand.Length > 4) {
+                            action.rotation = new Vector3(
+                                float.Parse(splitcommand[1]),
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3])
+                            );
 
-                case "smooth":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RandomizeSmoothness";
-                    action["objectIds"] = new string[] { "small|room|14", "Sofa1" };
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
+                            if (splitcommand.Length >= 5) {
+                                action.speed = float.Parse(splitcommand[4]);
+                            }
+                        }
 
-                case "dmlh":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "DropMidLevelHand";
-                    CurrentActiveController().ProcessControlCommand(action);
-                    break;
-                }
-                case "smlhr":
-                {
-                    ServerAction action = new ServerAction();
-                    action.action = "SetHandSphereRadius";
+                        CurrentActiveController().ProcessControlCommand(action);
+
+                        break;
+                    }
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action.radius = float.Parse(splitcommand[1]);
+                case "pumlh": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "PickUpMidLevelHand";
+                        action["objectIds"] = new List<string>
+                        {
+                        "Bread|-00.52|+01.17|-00.03",
+                        "Apple|-00.54|+01.15|+00.18"
+                    };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    CurrentActiveController().ProcessControlCommand(action);
 
-                    break;
-                }
-                case "cr":
-                {
-                    // dynamic action = new JObject();
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-
-                    // AssetDatabase.Refresh();
-                    action["action"] = "CreateRoom";
-                    TextAsset text = Resources.Load<TextAsset>("rooms/" + "4.json");
-                    var ROOM_BASE_PATH = "/Resources/rooms/";
-                    path = "";
-                    if (splitcommand.Length == 1)
-                    {
-                        // opens up a file explorer in the background
-                        path = EditorUtility.OpenFilePanel(
-                            title: "Open JSON actions file.",
-                            directory: "Resources",
-                            extension: "json"
-                        );
+                case "smooth": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RandomizeSmoothness";
+                        action["objectIds"] = new string[] { "small|room|14", "Sofa1" };
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    else if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
-                        }
-                        path = Application.dataPath + ROOM_BASE_PATH + file;
+
+                case "dmlh": {
+                        ServerAction action = new ServerAction();
+                        action.action = "DropMidLevelHand";
+                        CurrentActiveController().ProcessControlCommand(action);
+                        break;
                     }
-                    //var json = text.text;
+                case "smlhr": {
+                        ServerAction action = new ServerAction();
+                        action.action = "SetHandSphereRadius";
 
-                    // var json = text.text;
+                        if (splitcommand.Length == 2) {
+                            action.radius = float.Parse(splitcommand[1]);
+                        }
+                        CurrentActiveController().ProcessControlCommand(action);
 
-                    // var json = "{\r\n  \"walls\": [\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    }\r\n  ]\r\n}";
-                    // var walls = Newtonsoft.Json.JsonConvert.DeserializeObject<TestRoom>(json);
+                        break;
+                    }
+                case "cr": {
+                        // dynamic action = new JObject();
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+
+                        // AssetDatabase.Refresh();
+                        action["action"] = "CreateRoom";
+                        TextAsset text = Resources.Load<TextAsset>("rooms/" + "4.json");
+                        var ROOM_BASE_PATH = "/Resources/rooms/";
+                        path = "";
+                        if (splitcommand.Length == 1) {
+                            // opens up a file explorer in the background
+                            path = EditorUtility.OpenFilePanel(
+                                title: "Open JSON actions file.",
+                                directory: "Resources",
+                                extension: "json"
+                            );
+                        } else if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + ROOM_BASE_PATH + file;
+                        }
+                        //var json = text.text;
 
-                    // Debug.Log($"App path {Application.dataPath}");
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        // var json = text.text;
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        // var json = "{\r\n  \"walls\": [\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 2.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 3.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 10.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 4.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 9.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 7.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 8.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 4.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 0.5,\r\n        \"y\": 0,\r\n        \"z\": 5.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 7.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 8.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 1.5,\r\n        \"y\": 0,\r\n        \"z\": 9.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 6.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 5.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 3.5\r\n      }\r\n    },\r\n    {\r\n      \"p0\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 1.5\r\n      },\r\n      \"p1\": {\r\n        \"x\": 6.5,\r\n        \"y\": 0,\r\n        \"z\": 2.5\r\n      }\r\n    }\r\n  ]\r\n}";
+                        // var walls = Newtonsoft.Json.JsonConvert.DeserializeObject<TestRoom>(json);
 
-                    // var k = JObject.Parse(jsonStr);
-                    // JArray wallsJson = k["walls"];
+                        // Debug.Log($"App path {Application.dataPath}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    // foreach (JObject wall in wallsJson) {
-                    // 	while (PhysicsController.IsProcessing) {
-                    // 		yield return new WaitForEndOfFrame();
-                    // 	}
+                        // var k = JObject.Parse(jsonStr);
+                        // JArray wallsJson = k["walls"];
 
-                    // 	CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action));
-                    // }
 
-                    // var r = k.ToObject<Thor.Procedural.Data.TestRoom>();
+                        // foreach (JObject wall in wallsJson) {
+                        // 	while (PhysicsController.IsProcessing) {
+                        // 		yield return new WaitForEndOfFrame();
+                        // 	}
 
-                    // var l = new List<Thor.Procedural.Data.Wall>();
-                    // foreach (var wall in wallsJson) {
-                    // 	l.Add(wall.ToObject<Thor.Procedural.Data.Wall>());
-                    // }
-                    action["walls"] = obj["walls"];
-                    action["wallHeight"] = 2.0f;
-                    action["wallMaterialId"] = "DrywallOrange";
-                    action["floorMaterialId"] = "DarkWoodFloors";
-                    action["ceilingMaterialId"] = "";
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-
-                    // CurrentActiveController().CreateRoom(
-                    // 	new Wall[] {
-                    // 		new Wall() {
-                    // 			p0 = new Vector3(0, 0, 0),
-                    // 			p1 = new Vector3(10, 0, 0),
-                    // 			height = 2.0f,
-                    // 			materialId = "DrywallOrange"
-                    // 		},
-                    // 		new Wall() {
-                    // 			p0 = new Vector3(0, 0, 10),
-                    // 			p1 = new Vector3(10, 0, 10),
-                    // 			height = 2.0f,
-                    // 			materialId = "DrywallOrange"
-                    // 		},
-                    // 		new Wall() {
-                    // 			p0 = new Vector3(10, 0, 10),
-                    // 			p1 = new Vector3(10, 0, 0),
-                    // 			height = 2.0f,
-                    // 			materialId = "DrywallOrange"
-                    // 		},
-                    // 		new Wall() {
-                    // 			p0 = new Vector3(0, 0, 10),
-                    // 			p1 = new Vector3(0, 0, 0),
-                    // 			height = 2.0f,
-                    // 			materialId = "DrywallOrange"
-                    // 		}
-                    // 	},
-                    // 	2.0f,
-                    // 	"DrywallOrange",
-                    // 	"DarkWoodFloors"
-                    // );
-                    break;
+                        // 	CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action));
+                        // }
 
-                    // public void CreateRoom(Wall[] walls, float wallHeight, string wallMaterialId, string floorMaterialId, string ceilingMaterialId, float wallThickness = 0.0f, string namePostFix = "") {
-                }
-                case "newScene":
-                {
-                    UnityEngine.SceneManagement.SceneManager.LoadScene("FloorPlan402_physics");
-                    break;
-                }
-                case "newScene2":
-                {
-                    UnityEngine.SceneManagement.SceneManager.LoadScene("Procedural");
-                    break;
-                }
-                case "ch":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        // var r = k.ToObject<Thor.Procedural.Data.TestRoom>();
 
-                    // AssetDatabase.Refresh();
-                    action["action"] = "CreateHouse";
+                        // var l = new List<Thor.Procedural.Data.Wall>();
+                        // foreach (var wall in wallsJson) {
+                        // 	l.Add(wall.ToObject<Thor.Procedural.Data.Wall>());
+                        // }
+                        action["walls"] = obj["walls"];
+                        action["wallHeight"] = 2.0f;
+                        action["wallMaterialId"] = "DrywallOrange";
+                        action["floorMaterialId"] = "DarkWoodFloors";
+                        action["ceilingMaterialId"] = "";
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+
+                        // CurrentActiveController().CreateRoom(
+                        // 	new Wall[] {
+                        // 		new Wall() {
+                        // 			p0 = new Vector3(0, 0, 0),
+                        // 			p1 = new Vector3(10, 0, 0),
+                        // 			height = 2.0f,
+                        // 			materialId = "DrywallOrange"
+                        // 		},
+                        // 		new Wall() {
+                        // 			p0 = new Vector3(0, 0, 10),
+                        // 			p1 = new Vector3(10, 0, 10),
+                        // 			height = 2.0f,
+                        // 			materialId = "DrywallOrange"
+                        // 		},
+                        // 		new Wall() {
+                        // 			p0 = new Vector3(10, 0, 10),
+                        // 			p1 = new Vector3(10, 0, 0),
+                        // 			height = 2.0f,
+                        // 			materialId = "DrywallOrange"
+                        // 		},
+                        // 		new Wall() {
+                        // 			p0 = new Vector3(0, 0, 10),
+                        // 			p1 = new Vector3(0, 0, 0),
+                        // 			height = 2.0f,
+                        // 			materialId = "DrywallOrange"
+                        // 		}
+                        // 	},
+                        // 	2.0f,
+                        // 	"DrywallOrange",
+                        // 	"DarkWoodFloors"
+                        // );
+                        break;
 
-                    var jsonStr = System.IO.File.ReadAllText(
-                        Application.dataPath + "/Resources/rooms/house.json"
-                    );
-                    Debug.Log($"jjson: {jsonStr}");
+                        // public void CreateRoom(Wall[] walls, float wallHeight, string wallMaterialId, string floorMaterialId, string ceilingMaterialId, float wallThickness = 0.0f, string namePostFix = "") {
+                    }
+                case "newScene": {
+                        UnityEngine.SceneManagement.SceneManager.LoadScene("FloorPlan402_physics");
+                        break;
+                    }
+                case "newScene2": {
+                        UnityEngine.SceneManagement.SceneManager.LoadScene("Procedural");
+                        break;
+                    }
+                case "ch": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        // AssetDatabase.Refresh();
+                        action["action"] = "CreateHouse";
 
-                    action["house"] = obj;
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-
-                    // CurrentActiveController().CreateHouse(
-                    // 	new House() {
-                    // 		ceilingMaterialId = "DrywallOrange",
-                    // 		rooms = new RectangleRoom[] {
-                    // 			new RectangleRoom() {
-                    // 				walls =
-                    // 				new Wall[] {
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(0, 0, 0),
-                    // 						p1 = new Vector3(10, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(0, 0, 10),
-                    // 						p1 = new Vector3(10, 0, 10),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(10, 0, 10),
-                    // 						p1 = new Vector3(10, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(0, 0, 10),
-                    // 						p1 = new Vector3(0, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					}
-                    // 				},
-                    // 				rectangleFloor = new RectangleFloor() {
-                    // 					materialId = "DarkWoodFloors"
-                    // 				}
-                    // 			},
-                    // 			new RectangleRoom() {
-                    // 				walls =
-                    // 				new Wall[] {
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(2.5f, 0, 0),
-                    // 						p1 = new Vector3(5, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(2.5f, 0, 5),
-                    // 						p1 = new Vector3(5, 0, 5),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(5, 0, 5),
-                    // 						p1 = new Vector3(5, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					},
-                    // 					new Wall() {
-                    // 						p0 = new Vector3(2.5f, 0, 5),
-                    // 						p1 = new Vector3(2.5f, 0, 0),
-                    // 						height = 2.0f,
-                    // 						materialId = "DrywallOrange"
-                    // 					}
-                    // 				},
-                    // 				rectangleFloor = new RectangleFloor() {
-                    // 					materialId = "DarkWoodFloors"
-                    // 				}
-                    // 			},
-                    // 		}
-                    // 	}
-                    // );
+                        var jsonStr = System.IO.File.ReadAllText(
+                            Application.dataPath + "/Resources/rooms/house.json"
+                        );
+                        Debug.Log($"jjson: {jsonStr}");
+
+                        JObject obj = JObject.Parse(jsonStr);
+
+                        action["house"] = obj;
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+
+                        // CurrentActiveController().CreateHouse(
+                        // 	new House() {
+                        // 		ceilingMaterialId = "DrywallOrange",
+                        // 		rooms = new RectangleRoom[] {
+                        // 			new RectangleRoom() {
+                        // 				walls =
+                        // 				new Wall[] {
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(0, 0, 0),
+                        // 						p1 = new Vector3(10, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(0, 0, 10),
+                        // 						p1 = new Vector3(10, 0, 10),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(10, 0, 10),
+                        // 						p1 = new Vector3(10, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(0, 0, 10),
+                        // 						p1 = new Vector3(0, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					}
+                        // 				},
+                        // 				rectangleFloor = new RectangleFloor() {
+                        // 					materialId = "DarkWoodFloors"
+                        // 				}
+                        // 			},
+                        // 			new RectangleRoom() {
+                        // 				walls =
+                        // 				new Wall[] {
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(2.5f, 0, 0),
+                        // 						p1 = new Vector3(5, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(2.5f, 0, 5),
+                        // 						p1 = new Vector3(5, 0, 5),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(5, 0, 5),
+                        // 						p1 = new Vector3(5, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					},
+                        // 					new Wall() {
+                        // 						p0 = new Vector3(2.5f, 0, 5),
+                        // 						p1 = new Vector3(2.5f, 0, 0),
+                        // 						height = 2.0f,
+                        // 						materialId = "DrywallOrange"
+                        // 					}
+                        // 				},
+                        // 				rectangleFloor = new RectangleFloor() {
+                        // 					materialId = "DarkWoodFloors"
+                        // 				}
+                        // 			},
+                        // 		}
+                        // 	}
+                        // );
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "obj":
-                {
-                    // AssetDatabase.Refresh();
-                    var OBJECTS_BASE_PATH = "/Resources/objects/";
+                case "obj": {
+                        // AssetDatabase.Refresh();
+                        var OBJECTS_BASE_PATH = "/Resources/objects/";
 
-                    path = Application.dataPath + OBJECTS_BASE_PATH + "main.json";
+                        path = Application.dataPath + OBJECTS_BASE_PATH + "main.json";
 
-                    if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
+                        if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + OBJECTS_BASE_PATH + file;
                         }
-                        path = Application.dataPath + OBJECTS_BASE_PATH + file;
-                    }
 
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    obj["action"] = "CreateRuntimeAsset";
-                    obj["serializable"] = true;
-                    CurrentActiveController().ProcessControlCommand(new DynamicServerAction(obj));
+                        obj["action"] = "CreateRuntimeAsset";
+                        obj["serializable"] = true;
+                        CurrentActiveController().ProcessControlCommand(new DynamicServerAction(obj));
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "chp":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                case "chp": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    // AssetDatabase.Refresh();
-                    action["action"] = "CreateHouse";
-                    var ROOM_BASE_PATH = "/Resources/rooms/";
+                        // AssetDatabase.Refresh();
+                        action["action"] = "CreateHouse";
+                        var ROOM_BASE_PATH = "/Resources/rooms/";
 
-                    path = Application.dataPath + "/Resources/rooms/house_full.json";
+                        path = Application.dataPath + "/Resources/rooms/house_full.json";
 
-                    if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
+                        if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + ROOM_BASE_PATH + file;
                         }
-                        path = Application.dataPath + ROOM_BASE_PATH + file;
-                    }
 
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    action["house"] = obj;
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
+                        action["house"] = obj;
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
 
-                    break;
-                }
-                case "chp_direct":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        break;
+                    }
+                case "chp_direct": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    // AssetDatabase.Refresh();
-                    action["action"] = "CreateHouse";
-                    var ROOM_BASE_PATH = "/Resources/rooms/";
+                        // AssetDatabase.Refresh();
+                        action["action"] = "CreateHouse";
+                        var ROOM_BASE_PATH = "/Resources/rooms/";
 
-                    path = Application.dataPath + "/Resources/rooms/house_full.json";
+                        path = Application.dataPath + "/Resources/rooms/house_full.json";
 
-                    if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
+                        if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + ROOM_BASE_PATH + file;
                         }
-                        path = Application.dataPath + ROOM_BASE_PATH + file;
-                    }
 
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    action["house"] = obj;
-                    // CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action));
-                    ProceduralTools.CreateHouse(
-                        obj.ToObject<ProceduralHouse>(),
-                        ProceduralTools.GetMaterials()
-                    );
-                    break;
-                }
-                case "chpt_direct":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["house"] = obj;
+                        // CurrentActiveController().ProcessControlCommand(new DynamicServerAction(action));
+                        ProceduralTools.CreateHouse(
+                            obj.ToObject<ProceduralHouse>(),
+                            ProceduralTools.GetMaterials()
+                        );
+                        break;
+                    }
+                case "chpt_direct": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    // AssetDatabase.Refresh();
-                    var ROOM_BASE_PATH = "/Resources/rooms/";
+                        // AssetDatabase.Refresh();
+                        var ROOM_BASE_PATH = "/Resources/rooms/";
 
-                    path = Application.dataPath + "/Resources/rooms/house-template.json";
+                        path = Application.dataPath + "/Resources/rooms/house-template.json";
 
-                    if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
+                        if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + ROOM_BASE_PATH + file;
                         }
-                        path = Application.dataPath + ROOM_BASE_PATH + file;
-                    }
 
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    var house = Thor.Procedural.Templates.createHouseFromTemplate(
-                        obj.ToObject<HouseTemplate>()
-                    );
-                    // var house = CurrentActiveController().actionReturn;
+                        var house = Thor.Procedural.Templates.createHouseFromTemplate(
+                            obj.ToObject<HouseTemplate>()
+                        );
+                        // var house = CurrentActiveController().actionReturn;
 
 
-                    action.Clear();
+                        action.Clear();
 
-                    action["action"] = "CreateHouse";
-                    action["house"] = house;
+                        action["action"] = "CreateHouse";
+                        action["house"] = house;
 
-                    var jsonResolver = new ShouldSerializeContractResolver();
-                    var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
-                        house,
-                        Newtonsoft.Json.Formatting.None,
-                        new Newtonsoft.Json.JsonSerializerSettings()
-                        {
-                            ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
-                            ContractResolver = jsonResolver
-                        }
-                    );
+                        var jsonResolver = new ShouldSerializeContractResolver();
+                        var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
+                            house,
+                            Newtonsoft.Json.Formatting.None,
+                            new Newtonsoft.Json.JsonSerializerSettings() {
+                                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
+                                ContractResolver = jsonResolver
+                            }
+                        );
 
-                    Debug.Log("House: " + houseString);
-                    string destination = path =
-                        Application.dataPath + ROOM_BASE_PATH + "template-out-house.json";
+                        Debug.Log("House: " + houseString);
+                        string destination = path =
+                            Application.dataPath + ROOM_BASE_PATH + "template-out-house.json";
 
-                    System.IO.File.WriteAllText(destination, houseString);
+                        System.IO.File.WriteAllText(destination, houseString);
 
-                    ProceduralTools.CreateHouse(
-                        JObject.FromObject(house).ToObject<ProceduralHouse>(),
-                        ProceduralTools.GetMaterials()
-                    );
+                        ProceduralTools.CreateHouse(
+                            JObject.FromObject(house).ToObject<ProceduralHouse>(),
+                            ProceduralTools.GetMaterials()
+                        );
 
-                    break;
-                }
-                case "chpt":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        break;
+                    }
+                case "chpt": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    // AssetDatabase.Refresh();
-                    action["action"] = "GetHouseFromTemplate";
-                    var ROOM_BASE_PATH = "/Resources/rooms/";
+                        // AssetDatabase.Refresh();
+                        action["action"] = "GetHouseFromTemplate";
+                        var ROOM_BASE_PATH = "/Resources/rooms/";
 
-                    path = Application.dataPath + "/Resources/rooms/house-template.json";
+                        path = Application.dataPath + "/Resources/rooms/house-template.json";
 
-                    if (splitcommand.Length == 2)
-                    {
-                        // uses ./debug/{splitcommand[1]}[.json]
-                        file = splitcommand[1].Trim();
-                        if (!file.EndsWith(".json"))
-                        {
-                            file += ".json";
+                        if (splitcommand.Length == 2) {
+                            // uses ./debug/{splitcommand[1]}[.json]
+                            file = splitcommand[1].Trim();
+                            if (!file.EndsWith(".json")) {
+                                file += ".json";
+                            }
+                            path = Application.dataPath + ROOM_BASE_PATH + file;
                         }
-                        path = Application.dataPath + ROOM_BASE_PATH + file;
-                    }
 
-                    var jsonStr = System.IO.File.ReadAllText(path);
-                    Debug.Log($"jjson: {jsonStr}");
+                        var jsonStr = System.IO.File.ReadAllText(path);
+                        Debug.Log($"jjson: {jsonStr}");
 
-                    JObject obj = JObject.Parse(jsonStr);
+                        JObject obj = JObject.Parse(jsonStr);
 
-                    action["template"] = obj;
+                        action["template"] = obj;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
 
-                    var house = CurrentActiveController().actionReturn;
+                        var house = CurrentActiveController().actionReturn;
 
-                    Debug.Log(house);
+                        Debug.Log(house);
 
-                    action.Clear();
+                        action.Clear();
 
-                    action["action"] = "CreateHouse";
-                    action["house"] = house;
+                        action["action"] = "CreateHouse";
+                        action["house"] = house;
 
-                    var jsonResolver = new ShouldSerializeContractResolver();
-                    var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
-                        house,
-                        Newtonsoft.Json.Formatting.None,
-                        new Newtonsoft.Json.JsonSerializerSettings()
-                        {
-                            ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
-                            ContractResolver = jsonResolver
-                        }
-                    );
-                    string destination = path =
-                        Application.dataPath + ROOM_BASE_PATH + "template-out-house.json";
+                        var jsonResolver = new ShouldSerializeContractResolver();
+                        var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
+                            house,
+                            Newtonsoft.Json.Formatting.None,
+                            new Newtonsoft.Json.JsonSerializerSettings() {
+                                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
+                                ContractResolver = jsonResolver
+                            }
+                        );
+                        string destination = path =
+                            Application.dataPath + ROOM_BASE_PATH + "template-out-house.json";
 
-                    System.IO.File.WriteAllText(destination, houseString);
+                        System.IO.File.WriteAllText(destination, houseString);
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
 
-                    break;
-                }
-                case "gad":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        break;
+                    }
+                case "gad": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    // AssetDatabase.Refresh();
-                    action["action"] = "GetAssetDatabase";
+                        // AssetDatabase.Refresh();
+                        action["action"] = "GetAssetDatabase";
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    // var assetMetadata = (List<AssetMetadata>)CurrentActiveController().actionReturn as List<AssetMetadata>;
-                    // Debug.Log($"assetDb: {string.Join("\n", assetMetadata.Select(m => $"{m.id}|{m.type}|box: {m.boundingBox.min}, {m.boundingBox.max}, {m.primaryProperty}"))}");
-                    break;
-                }
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        // var assetMetadata = (List<AssetMetadata>)CurrentActiveController().actionReturn as List<AssetMetadata>;
+                        // Debug.Log($"assetDb: {string.Join("\n", assetMetadata.Select(m => $"{m.id}|{m.type}|box: {m.boundingBox.min}, {m.boundingBox.max}, {m.primaryProperty}"))}");
+                        break;
+                    }
 
-                case "gadt":
-                {
-                    CurrentActiveController().GetAssetDatabase();
-                    var assetMetadata =
-                        (List<AssetMetadata>)CurrentActiveController().actionReturn
-                        as List<AssetMetadata>;
+                case "gadt": {
+                        CurrentActiveController().GetAssetDatabase();
+                        var assetMetadata =
+                            (List<AssetMetadata>)CurrentActiveController().actionReturn
+                            as List<AssetMetadata>;
 
-                    break;
-                }
-                case "soirr":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SpawnObjectInReceptacleRandomly";
-                    action["prefabName"] = "Coffee_Table_211_1";
-                    action["objectId"] = "THISISATABLE";
-                    action["targetReceptacle"] = "Floor|+00.00|+00.00|+00.00";
-                    action["rotation"] = new FlexibleRotation()
-                    {
-                        axis = new Vector3(0, 1, 0),
-                        degrees = 45
-                    };
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "soir":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SpawnObjectInReceptacle";
-                    action["prefabName"] = "Dining_Table_16_1";
-                    action["objectId"] = "THISISATABLE";
-                    action["targetReceptacle"] = "Floor|+00.00|+00.00|+00.00";
-                    action["position"] = new Vector3(5f, 0.0006076097f, 8.15f);
-                    action["rotation"] = new FlexibleRotation()
-                    {
-                        axis = new Vector3(0, 1, 0),
-                        degrees = 45
-                    };
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "bnm":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "BakeNavMesh";
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "va":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SpawnAsset";
-                    action["assetId"] = "Dining_Table_16_1";
-                    action["generatedId"] = "asset_0";
-                    // action["skyboxColor"] = new Color(0, 0, 0, 1);
+                        break;
+                    }
+                case "soirr": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SpawnObjectInReceptacleRandomly";
+                        action["prefabName"] = "Coffee_Table_211_1";
+                        action["objectId"] = "THISISATABLE";
+                        action["targetReceptacle"] = "Floor|+00.00|+00.00|+00.00";
+                        action["rotation"] = new FlexibleRotation() {
+                            axis = new Vector3(0, 1, 0),
+                            degrees = 45
+                        };
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
+                    }
+                case "soir": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SpawnObjectInReceptacle";
+                        action["prefabName"] = "Dining_Table_16_1";
+                        action["objectId"] = "THISISATABLE";
+                        action["targetReceptacle"] = "Floor|+00.00|+00.00|+00.00";
+                        action["position"] = new Vector3(5f, 0.0006076097f, 8.15f);
+                        action["rotation"] = new FlexibleRotation() {
+                            axis = new Vector3(0, 1, 0),
+                            degrees = 45
+                        };
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
+                    }
+                case "bnm": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "BakeNavMesh";
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
+                    }
+                case "va": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SpawnAsset";
+                        action["assetId"] = "Dining_Table_16_1";
+                        action["generatedId"] = "asset_0";
+                        // action["skyboxColor"] = new Color(0, 0, 0, 1);
+
+                        if (splitcommand.Length == 2) {
+                            action["assetId"] = splitcommand[1];
+                        }
 
-                    if (splitcommand.Length == 2)
-                    {
-                        action["assetId"] = splitcommand[1];
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
                     }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
+                case "ra": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "RotateObject";
+                        action["objectId"] = "asset_0";
 
-                case "ra":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "RotateObject";
-                    action["objectId"] = "asset_0";
+                        if (splitcommand.Length > 4) {
+                            action["angleAxisRotation"] = new FlexibleRotation() {
+                                axis = new Vector3(
+                                    float.Parse(splitcommand[1]),
+                                    float.Parse(splitcommand[2]),
+                                    float.Parse(splitcommand[3])
+                                ),
+                                degrees = float.Parse(splitcommand[4])
+                            };
+                        }
+                        if (splitcommand.Length == 6) {
+                            action["absolute"] = bool.Parse(splitcommand[5]);
+                        }
 
-                    if (splitcommand.Length > 4)
-                    {
-                        action["angleAxisRotation"] = new FlexibleRotation()
-                        {
-                            axis = new Vector3(
-                                float.Parse(splitcommand[1]),
-                                float.Parse(splitcommand[2]),
-                                float.Parse(splitcommand[3])
-                            ),
-                            degrees = float.Parse(splitcommand[4])
-                        };
-                    }
-                    if (splitcommand.Length == 6)
-                    {
-                        action["absolute"] = bool.Parse(splitcommand[5]);
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
                     }
+                case "laoc": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "LookAtObjectCenter";
+                        action["objectId"] = "asset_0";
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "laoc":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "LookAtObjectCenter";
-                    action["objectId"] = "asset_0";
-
-                    if (splitcommand.Length == 2)
-                    {
-                        action["objectId"] = splitcommand[1];
+                        if (splitcommand.Length == 2) {
+                            action["objectId"] = splitcommand[1];
+                        }
+
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
                     }
+                case "sky": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "SetSkybox";
+                        action["color"] = new Color(0, 0, 0, 1);
+                        if (splitcommand.Length == 5) {
+                            action["color"] = new Color(
+                                float.Parse(splitcommand[1]),
+                                float.Parse(splitcommand[2]),
+                                float.Parse(splitcommand[3]),
+                                float.Parse(splitcommand[4])
+                            );
+                        }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "sky":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "SetSkybox";
-                    action["color"] = new Color(0, 0, 0, 1);
-                    if (splitcommand.Length == 5)
-                    {
-                        action["color"] = new Color(
-                            float.Parse(splitcommand[1]),
-                            float.Parse(splitcommand[2]),
-                            float.Parse(splitcommand[3]),
-                            float.Parse(splitcommand[4])
-                        );
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
                     }
+                case "g3d": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "GetAsset3DGeometry";
+                        if (splitcommand.Length == 2) {
+                            action["assetId"] = splitcommand[1];
+                        }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
-                case "g3d":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "GetAsset3DGeometry";
-                    if (splitcommand.Length == 2)
-                    {
-                        action["assetId"] = splitcommand[1];
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        var geos =
+                            (List<Geometry3D>)CurrentActiveController().actionReturn
+                            as List<Geometry3D>;
+                        Debug.Log($"Geo count: {geos.Count}");
+                        var geo = geos.First();
+                        Debug.Log(
+                            $"Geometry. vertexCount: {geo.vertices.Length}, triangleCount: {geo.triangleIndices.Length / 3}, some: {string.Join(", ", geo.triangleIndices.Take(12))}"
+                        );
+                        break;
                     }
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    var geos =
-                        (List<Geometry3D>)CurrentActiveController().actionReturn
-                        as List<Geometry3D>;
-                    Debug.Log($"Geo count: {geos.Count}");
-                    var geo = geos.First();
-                    Debug.Log(
-                        $"Geometry. vertexCount: {geo.vertices.Length}, triangleCount: {geo.triangleIndices.Length / 3}, some: {string.Join(", ", geo.triangleIndices.Take(12))}"
-                    );
-                    break;
-                }
+                case "ca_msg": {
+                        if (splitcommand.Length == 2) {
+                            var objectId = splitcommand[1];
 
-                case "ca_msg":
-                {
-                    if (splitcommand.Length == 2)
-                    {
-                        var objectId = splitcommand[1];
+                            var fname = objectId.Trim();
+                            // if (!fname.EndsWith(".json")) {
+                            //     fname += ".msgpack.gz";
+                            // }
 
-                        var fname = objectId.Trim();
-                        // if (!fname.EndsWith(".json")) {
-                        //     fname += ".msgpack.gz";
-                        // }
+                            var pathSplit = Application.dataPath.Split('/');
 
-                        var pathSplit = Application.dataPath.Split('/');
+                            var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
+                            Debug.Log(string.Join("/", repoRoot));
 
-                        var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
-                        Debug.Log(string.Join("/", repoRoot));
+                            var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
+                            var objectDir = $"{objaverseRoot}/{objectId}";
+                            var objectPath = $"{objectDir}/{fname}";
 
-                        var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
-                        var objectDir = $"{objaverseRoot}/{objectId}";
-                        var objectPath = $"{objectDir}/{fname}";
+                            // var filename = Path.GetFileName(objectPath);
 
-                        // var filename = Path.GetFileName(objectPath);
+                            //var pathOut = Application.dataPath + $"/Resources/msgpack_test/{objectId}.json";
 
-                        //var pathOut = Application.dataPath + $"/Resources/msgpack_test/{objectId}.json";
+                            var af = CurrentActiveController().CreateRuntimeAsset(fname, objaverseRoot);
+                            Debug.Log($"ActionFinished {af.success} {af.errorMessage}");
+                        }
 
-                        var af = CurrentActiveController().CreateRuntimeAsset(fname, objaverseRoot);
-                        Debug.Log($"ActionFinished {af.success} {af.errorMessage}");
+                        break;
                     }
+                case "caid_msg": {
+                        if (splitcommand.Length == 2) {
+                            var objectId = splitcommand[1];
 
-                    break;
-                }
-                case "caid_msg":
-                {
-                    if (splitcommand.Length == 2)
-                    {
-                        var objectId = splitcommand[1];
-
-                        var fname = objectId.Trim();
-                        if (!fname.EndsWith(".json"))
-                        {
-                            fname += ".msgpack.gz";
-                        }
+                            var fname = objectId.Trim();
+                            if (!fname.EndsWith(".json")) {
+                                fname += ".msgpack.gz";
+                            }
 
-                        var pathSplit = Application.dataPath.Split('/');
+                            var pathSplit = Application.dataPath.Split('/');
 
-                        var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
-                        Debug.Log(string.Join("/", repoRoot));
+                            var repoRoot = pathSplit.Reverse().Skip(2).Reverse().ToList();
+                            Debug.Log(string.Join("/", repoRoot));
 
-                        var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
-                        var objectDir = $"{objaverseRoot}/{objectId}";
-                        var objectPath = $"{objectDir}/{fname}";
-                        var dir = Application.persistentDataPath;
+                            var objaverseRoot = $"{string.Join("/", repoRoot)}/objaverse";
+                            var objectDir = $"{objaverseRoot}/{objectId}";
+                            var objectPath = $"{objectDir}/{fname}";
+                            var dir = Application.persistentDataPath;
 
-                        var filename = Path.GetFileName(objectPath);
+                            var filename = Path.GetFileName(objectPath);
 
-                        var pathOut =
-                            Application.dataPath + $"/Resources/msgpack_test/{objectId}.json";
+                            var pathOut =
+                                Application.dataPath + $"/Resources/msgpack_test/{objectId}.json";
 
-                        CurrentActiveController().CreateRuntimeAsset(objectId, dir);
-                    }
+                            CurrentActiveController().CreateRuntimeAsset(objectId, dir);
+                        }
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "proc_mats":
-                {
-                    var mats = ProceduralTools.GetMaterials();
-                    var matString = string.Join("\n", mats.Keys());
-                    Debug.Log(matString);
+                case "proc_mats": {
+                        var mats = ProceduralTools.GetMaterials();
+                        var matString = string.Join("\n", mats.Keys());
+                        Debug.Log(matString);
 
-                    //string destination = Application.persistentDataPath + "/save.dat";
-                    // FileStream f;
+                        //string destination = Application.persistentDataPath + "/save.dat";
+                        // FileStream f;
 
-                    StreamWriter f = new StreamWriter("mats.txt", append: false);
+                        StreamWriter f = new StreamWriter("mats.txt", append: false);
 
-                    f.WriteLine(matString);
-                    break;
-                }
-                case "proc_prefabs":
-                {
-                    var prefabs = ProceduralTools.GetPrefabs();
-                    var prefabsStr = string.Join("\n", prefabs.Keys());
-                    Debug.Log(prefabsStr);
+                        f.WriteLine(matString);
+                        break;
+                    }
+                case "proc_prefabs": {
+                        var prefabs = ProceduralTools.GetPrefabs();
+                        var prefabsStr = string.Join("\n", prefabs.Keys());
+                        Debug.Log(prefabsStr);
 
-                    //string destination = Application.persistentDataPath + "/save.dat";
-                    // FileStream f;
+                        //string destination = Application.persistentDataPath + "/save.dat";
+                        // FileStream f;
 
-                    StreamWriter f = new StreamWriter("prefabs.txt", append: false);
+                        StreamWriter f = new StreamWriter("prefabs.txt", append: false);
 
-                    f.WriteLine(prefabsStr);
-                    break;
-                }
-                case "nma":
-                {
-                    var navMeshAgent = GameObject.FindObjectOfType<NavMeshAgent>();
-                    Debug.Log($"Navmeshagent typeID: {navMeshAgent.agentTypeID}");
-                    break;
-                }
-                case "tadfa":
-                {
-                    Dictionary<string, object> action = new Dictionary<string, object>();
-                    action["action"] = "TestActionDispatchFindAmbiguous";
-                    action["typeName"] =
-                        "UnityStandardAssets.Characters.FirstPerson.PhysicsRemoteFPSAgentController";
+                        f.WriteLine(prefabsStr);
+                        break;
+                    }
+                case "nma": {
+                        var navMeshAgent = GameObject.FindObjectOfType<NavMeshAgent>();
+                        Debug.Log($"Navmeshagent typeID: {navMeshAgent.agentTypeID}");
+                        break;
+                    }
+                case "tadfa": {
+                        Dictionary<string, object> action = new Dictionary<string, object>();
+                        action["action"] = "TestActionDispatchFindAmbiguous";
+                        action["typeName"] =
+                            "UnityStandardAssets.Characters.FirstPerson.PhysicsRemoteFPSAgentController";
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
 
-                    var obj = (List<string>)(CurrentActiveController().actionReturn);
-                    Debug.Log($"{string.Join(",", obj)}");
-                    break;
-                }
+                        var obj = (List<string>)(CurrentActiveController().actionReturn);
+                        Debug.Log($"{string.Join(",", obj)}");
+                        break;
+                    }
 
-                case "proc_arr":
-                {
-                    var arr = new int[][]
-                    {
+                case "proc_arr": {
+                        var arr = new int[][]
+                        {
                         new int[] { 2, 2, 2, 2 },
                         new int[] { 2, 1, 1, 2 },
                         new int[] { 2, 1, 1, 2 },
                         new int[] { 2, 1, 1, 2 },
                         new int[] { 2, 2, 2, 2 },
-                    };
+                        };
 
-                    var layout =
-                        $@"
+                        var layout =
+                            $@"
                         2 2 2 2
                         2 1 1 2
                         2 1 1 2
                         2 2 2 2
                     ";
 
-                    var doors =
-                        @"
+                        var doors =
+                            @"
                         2 = 2 2
                         2 = 1 2
                         2 1 1 2
                         2 2 2 2";
 
-                    var objects =
-                        @"
+                        var objects =
+                            @"
                         2 2 2 2
                         2 1 1 2
                         2 * 1 2
                         2 2 2 +";
-                    // var arr = new int[][] {
-                    //     new int[]{0, 0, 0},
-                    //     new int[]{0, 1, 0},
-                    //     new int[]{0, 0, 0}
-                    // };
+                        // var arr = new int[][] {
+                        //     new int[]{0, 0, 0},
+                        //     new int[]{0, 1, 0},
+                        //     new int[]{0, 0, 0}
+                        // };
 
-                    // 2: [ (0, 0),(0, 1),(0, 2),(0, 3),(1, 3),(2, 3),(3, 3) ]
-                    // 1: [ (1, 1),(1, 2),(2, 2),(3, 2),(3, 1),(2, 1) ]
+                        // 2: [ (0, 0),(0, 1),(0, 2),(0, 3),(1, 3),(2, 3),(3, 3) ]
+                        // 1: [ (1, 1),(1, 2),(2, 2),(3, 2),(3, 1),(2, 1) ]
 
-                    // 1: [ ((0, 0), (1, 1)),((1, 1), (1, 2)),((0, 0), (1, 2)),((1, 2), (2, 2)),((0, 0), (2, 2)),((2, 2), (2, 1)),((0, 0), (2, 1)),((2, 1), (1, 1)) ]
+                        // 1: [ ((0, 0), (1, 1)),((1, 1), (1, 2)),((0, 0), (1, 2)),((1, 2), (2, 2)),((0, 0), (2, 2)),((2, 2), (2, 1)),((0, 0), (2, 1)),((2, 1), (1, 1)) ]
 
-                    var house = Templates.createHouseFromTemplate(
-                        new HouseTemplate()
-                        {
-                            id = "house_0",
-                            layout =
-                                $@"
+                        var house = Templates.createHouseFromTemplate(
+                            new HouseTemplate() {
+                                id = "house_0",
+                                layout =
+                                    $@"
                                 0 0 0 0 0 0
                                 0 2 2 2 2 0
                                 0 2 2 2 2 0
@@ -6586,8 +5830,8 @@ 0 1 1 1 1 0
                                 0 1 1 1 1 0
                                 0 0 0 0 0 0
                             ",
-                            objectsLayouts = new List<string>()
-                            {
+                                objectsLayouts = new List<string>()
+                                {
                                 $@"
                                     0 0 0 0 0 0
                                     0 2 2 2 2 0
@@ -6604,33 +5848,33 @@ 0 1 1 1 1 0
                                     0 1 1 1 $ 0
                                     0 0 0 0 0 0
                                 "
-                            },
-                            // layout = $@"
-                            //    2 2 2 2 2
-                            //    2 2 2 2 2
-                            //    2 2 1 1 2
-                            //    2 2 1 1 2
-                            //    2 2 2 2 2
-                            // ",
-                            // objectsLayouts = new List<string>() {
-                            //     $@"
-                            //       2 2 2 2 2
-                            //       2 2 = 2 2
-                            //       2 2 = 1 2
-                            //       2 2 * 1 2
-                            //       2 2 2 2 +
-                            //     "
-                            //     ,
-                            //     $@"
-                            //       2 2 2 2 2
-                            //       2 2 2 2 2
-                            //       2 2 1 1 2
-                            //       2 2 1 1 2
-                            //       2 2 2 2 $
-                            //     "
-                            // },
-                            rooms = new Dictionary<string, RoomTemplate>()
-                            {
+                                },
+                                // layout = $@"
+                                //    2 2 2 2 2
+                                //    2 2 2 2 2
+                                //    2 2 1 1 2
+                                //    2 2 1 1 2
+                                //    2 2 2 2 2
+                                // ",
+                                // objectsLayouts = new List<string>() {
+                                //     $@"
+                                //       2 2 2 2 2
+                                //       2 2 = 2 2
+                                //       2 2 = 1 2
+                                //       2 2 * 1 2
+                                //       2 2 2 2 +
+                                //     "
+                                //     ,
+                                //     $@"
+                                //       2 2 2 2 2
+                                //       2 2 2 2 2
+                                //       2 2 1 1 2
+                                //       2 2 1 1 2
+                                //       2 2 2 2 $
+                                //     "
+                                // },
+                                rooms = new Dictionary<string, RoomTemplate>()
+                                {
                                 {
                                     "1",
                                     new RoomTemplate()
@@ -6679,9 +5923,9 @@ 0 0 0 0 0 0
                                         wallHeight = 3.0f
                                     }
                                 }
-                            },
-                            doors = new Dictionary<string, Thor.Procedural.Data.Door>()
-                            {
+                                },
+                                doors = new Dictionary<string, Thor.Procedural.Data.Door>()
+                                {
                                 {
                                     "=",
                                     new Thor.Procedural.Data.Door()
@@ -6691,9 +5935,9 @@ 0 0 0 0 0 0
                                         room0 = "1"
                                     }
                                 }
-                            },
-                            objects = new Dictionary<string, Thor.Procedural.Data.HouseObject>()
-                            {
+                                },
+                                objects = new Dictionary<string, Thor.Procedural.Data.HouseObject>()
+                                {
                                 {
                                     "*",
                                     new Thor.Procedural.Data.HouseObject()
@@ -6721,19 +5965,18 @@ 0 0 0 0 0 0
                                         position = new Vector3(0.1f, 1.5f, 0)
                                     }
                                 }
-                            },
-                            proceduralParameters = new ProceduralParameters()
-                            {
-                                ceilingMaterial = new MaterialProperties() { name = "ps_mat" },
-                                floorColliderThickness = 1.0f,
-                                receptacleHeight = 0.7f,
-                                skyboxId = "Sky1",
+                                },
+                                proceduralParameters = new ProceduralParameters() {
+                                    ceilingMaterial = new MaterialProperties() { name = "ps_mat" },
+                                    floorColliderThickness = 1.0f,
+                                    receptacleHeight = 0.7f,
+                                    skyboxId = "Sky1",
+                                }
                             }
-                        }
-                    );
+                        );
 
-                    var temp =
-                        @"
+                        var temp =
+                            @"
                         {
                             'rooms': {
                                 '1': {
@@ -6755,35 +5998,34 @@ 0 0 0 0 0 0
                         }
                     ";
 
-                    var jsonResolver = new ShouldSerializeContractResolver();
-                    var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
-                        house,
-                        Newtonsoft.Json.Formatting.None,
-                        new Newtonsoft.Json.JsonSerializerSettings()
-                        {
-                            ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
-                            ContractResolver = jsonResolver
-                        }
-                    );
-                    Debug.Log("#######   HOUSE\n" + houseString);
+                        var jsonResolver = new ShouldSerializeContractResolver();
+                        var houseString = Newtonsoft.Json.JsonConvert.SerializeObject(
+                            house,
+                            Newtonsoft.Json.Formatting.None,
+                            new Newtonsoft.Json.JsonSerializerSettings() {
+                                ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
+                                ContractResolver = jsonResolver
+                            }
+                        );
+                        Debug.Log("#######   HOUSE\n" + houseString);
 
-                    ProceduralTools.CreateHouse(house, ProceduralTools.GetMaterials());
+                        ProceduralTools.CreateHouse(house, ProceduralTools.GetMaterials());
 
-                    Debug.Log("#######   HOUSE Created \n");
+                        Debug.Log("#######   HOUSE Created \n");
 
-                    Dictionary<string, object> action = new Dictionary<string, object>();
+                        Dictionary<string, object> action = new Dictionary<string, object>();
 
-                    action["action"] = "TeleportFull";
-                    action["position"] = new Vector3(3.0f, 1.0f, 2.0f);
-                    action["rotation"] = new Vector3(0, 0, 0);
-                    action["horizon"] = 0.0f;
-                    action["standing"] = true;
-                    action["forceAction"] = true;
+                        action["action"] = "TeleportFull";
+                        action["position"] = new Vector3(3.0f, 1.0f, 2.0f);
+                        action["rotation"] = new Vector3(0, 0, 0);
+                        action["horizon"] = 0.0f;
+                        action["standing"] = true;
+                        action["forceAction"] = true;
 
-                    CurrentActiveController()
-                        .ProcessControlCommand(new DynamicServerAction(action));
-                    break;
-                }
+                        CurrentActiveController()
+                            .ProcessControlCommand(new DynamicServerAction(action));
+                        break;
+                    }
             }
 
             // StartCoroutine(CheckIfactionCompleteWasSetToTrueAfterWaitingALittleBit(splitcommand[0]));
@@ -6793,8 +6035,7 @@ 0 0 0 0 0 0
 #if UNITY_EDITOR
 
         // Taken from https://answers.unity.com/questions/1144378/copy-to-clipboard-with-a-button-unity-53-solution.html
-        public static void CopyToClipboard(string s)
-        {
+        public static void CopyToClipboard(string s) {
             TextEditor te = new TextEditor();
             te.text = s;
             te.SelectAll();
@@ -6802,22 +6043,17 @@ public static void CopyToClipboard(string s)
         }
 
         // used to show what's currently visible on the top left of the screen
-        void OnGUI()
-        {
+        void OnGUI() {
             if (
                 CurrentActiveController().VisibleSimObjPhysics != null
                 && this.controlMode != ControlMode.MINIMAL_FPS
-            )
-            {
-                if (CurrentActiveController().VisibleSimObjPhysics.Length > 10)
-                {
+            ) {
+                if (CurrentActiveController().VisibleSimObjPhysics.Length > 10) {
                     int horzIndex = -1;
                     GUILayout.BeginHorizontal();
-                    foreach (SimObjPhysics o in PhysicsController.VisibleSimObjPhysics)
-                    {
+                    foreach (SimObjPhysics o in PhysicsController.VisibleSimObjPhysics) {
                         horzIndex++;
-                        if (horzIndex >= 3)
-                        {
+                        if (horzIndex >= 3) {
                             GUILayout.EndHorizontal();
                             GUILayout.BeginHorizontal();
                             horzIndex = 0;
@@ -6830,14 +6066,11 @@ void OnGUI()
                     }
 
                     GUILayout.EndHorizontal();
-                }
-                else
-                {
+                } else {
                     // Plane[] planes = GeometryUtility.CalculateFrustumPlanes(m_Camera);
 
                     // int position_number = 0;
-                    foreach (SimObjPhysics o in CurrentActiveController().VisibleSimObjPhysics)
-                    {
+                    foreach (SimObjPhysics o in CurrentActiveController().VisibleSimObjPhysics) {
                         string suffix = "";
                         // Bounds bounds = new Bounds(o.gameObject.transform.position, new Vector3(0.05f, 0.05f, 0.05f));
                         // if (GeometryUtility.TestPlanesAABB(planes, bounds)) {
@@ -6864,8 +6097,7 @@ void OnGUI()
                                 UnityEditor.EditorStyles.miniButton,
                                 GUILayout.MinWidth(100f)
                             )
-                        )
-                        {
+                        ) {
                             CopyToClipboard(o.ObjectID);
                         }
                     }
diff --git a/unity/Assets/Scripts/DecalCollision.cs b/unity/Assets/Scripts/DecalCollision.cs
index e1e77dbdbf..07734ba8fe 100644
--- a/unity/Assets/Scripts/DecalCollision.cs
+++ b/unity/Assets/Scripts/DecalCollision.cs
@@ -2,15 +2,13 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public enum DecalRotationAxis
-{
+public enum DecalRotationAxis {
     NONE,
     FORWARD,
     SIDE
 }
 
-public class DecalCollision : Break
-{
+public class DecalCollision : Break {
     // If true Guarantees that other spawn planes under the same parent will have the same stencil value
     [SerializeField]
     private bool sameStencilAsSiblings = false;
@@ -39,34 +37,26 @@ public class DecalCollision : Break
 
     private static int currentStencilId = 0;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         breakType = BreakType.Decal;
         prevTime = Time.time;
 
         var mr = this.GetComponent<MeshRenderer>();
-        if (mr && mr.enabled)
-        {
-            if (transparent)
-            {
-                if (!sameStencilAsSiblings)
-                {
+        if (mr && mr.enabled) {
+            if (transparent) {
+                if (!sameStencilAsSiblings) {
                     setStencilWriteValue(mr);
-                }
-                else
-                {
+                } else {
                     var otherPlanes =
                         this.transform.parent.gameObject.GetComponentsInChildren<DecalCollision>();
                     // var otherPlanes = this.gameObject.GetComponentsInParent<DecalCollision>();
                     // Debug.Log("other planes id " + this.stencilWriteValue + " len " + otherPlanes.Length);
-                    foreach (var spawnPlane in otherPlanes)
-                    {
+                    foreach (var spawnPlane in otherPlanes) {
                         if (
                             spawnPlane.isActiveAndEnabled
                             && spawnPlane.stencilSet
                             && spawnPlane.sameStencilAsSiblings
-                        )
-                        {
+                        ) {
                             this.stencilWriteValue = spawnPlane.stencilWriteValue;
                             this.stencilSet = true;
                             mr.material.SetInt("_StencilRef", this.stencilWriteValue);
@@ -74,26 +64,21 @@ void OnEnable()
                             break;
                         }
                     }
-                    if (!stencilSet)
-                    {
+                    if (!stencilSet) {
                         setStencilWriteValue(mr);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 this.stencilWriteValue = 1;
                 mr.material.SetInt("_StencilRef", this.stencilWriteValue);
             }
         }
     }
 
-    private void setStencilWriteValue(MeshRenderer mr)
-    {
+    private void setStencilWriteValue(MeshRenderer mr) {
         DecalCollision.currentStencilId = DecalCollision.currentStencilId + 1;
         this.stencilWriteValue = DecalCollision.currentStencilId << 1;
-        if (this.stencilWriteValue > 0xFF)
-        {
+        if (this.stencilWriteValue > 0xFF) {
             this.stencilWriteValue = this.stencilWriteValue % 0xFF;
             // Debug.LogWarning("Stencil buffer write value overflow with: " + this.stencilWriteValue + " for " + this.gameObject.name + " wraping back to " + ", decal overlap with other spawn planes with same stencil value.");
         }
@@ -102,20 +87,15 @@ private void setStencilWriteValue(MeshRenderer mr)
         this.stencilSet = true;
     }
 
-    protected override void BreakForDecalType(Collision collision)
-    {
-        if (!transparent)
-        {
-            if (collision != null)
-            {
-                foreach (ContactPoint contact in collision.contacts)
-                {
+    protected override void BreakForDecalType(Collision collision) {
+        if (!transparent) {
+            if (collision != null) {
+                foreach (ContactPoint contact in collision.contacts) {
                     float newTime = Time.time;
                     float timeDiff = newTime - prevTime;
                     var scale = contact.otherCollider.bounds.size;
 
-                    if (timeDiff > nextDecalWaitTimeSeconds)
-                    {
+                    if (timeDiff > nextDecalWaitTimeSeconds) {
                         this.prevTime = Time.time;
 
                         // Taking into account the collider box of the object is breaking to resize the decal looks weirder than having the same decal size
@@ -131,25 +111,18 @@ protected override void BreakForDecalType(Collision collision)
                         break;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 spawnDecal(transform.position, this.transform.rotation, decalScale * 2);
             }
-        }
-        else
-        {
-            if (collision != null)
-            {
-                foreach (ContactPoint contact in collision.contacts)
-                {
+        } else {
+            if (collision != null) {
+                foreach (ContactPoint contact in collision.contacts) {
                     Debug.Log("Decal pre for " + this.stencilWriteValue);
                     float newTime = Time.time;
                     float timeDiff = newTime - prevTime;
                     var scale = contact.otherCollider.bounds.size;
 
-                    if (timeDiff > nextDecalWaitTimeSeconds)
-                    {
+                    if (timeDiff > nextDecalWaitTimeSeconds) {
                         this.prevTime = Time.time;
 
                         // Taking into account the collider box of the object is breaking to resize the decal looks weirder than having the same decal size
@@ -170,9 +143,7 @@ protected override void BreakForDecalType(Collision collision)
                         break;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 // Debug.Log("Spawn decal break " + this.transform.rotation + " final " + this.transform.rotation * Quaternion.Euler(-90, 0, 0));
                 // spawnDecal(this.transform.position,  this.transform.rotation * Quaternion.Euler(-90, 0, 0), decalScale * 2);
                 spawnDecal(
@@ -189,12 +160,10 @@ public void SpawnDecal(
         bool worldSpace = false,
         Vector3? scale = null,
         DecalRotationAxis randomRotationAxis = DecalRotationAxis.NONE
-    )
-    {
+    ) {
         // var pos = this.transform.InverseTransformPoint(worldPos);
         var pos = position;
-        if (worldSpace)
-        {
+        if (worldSpace) {
             pos = this.transform.InverseTransformPoint(position);
         }
         spawnDecal(
@@ -211,29 +180,23 @@ private void spawnDecal(
         Vector3 scale,
         DecalRotationAxis randomRotationAxis = DecalRotationAxis.NONE,
         int index = -1
-    )
-    {
+    ) {
         var minimumScale = this.transform.localScale;
         var decalScale = scale;
-        if (minimumScale.x < scale.x || minimumScale.y < scale.y)
-        {
+        if (minimumScale.x < scale.x || minimumScale.y < scale.y) {
             var minimumDim = Mathf.Min(minimumScale.x, minimumScale.y);
             decalScale = new Vector3(minimumDim, minimumDim, scale.z);
         }
         var selectIndex = index;
-        if (index < 0)
-        {
+        if (index < 0) {
             selectIndex = Random.Range(0, decals.Length);
         }
 
         var randomRotation = Quaternion.identity;
         var randomAngle = Random.Range(-180.0f, 180.0f);
-        if (randomRotationAxis == DecalRotationAxis.FORWARD)
-        {
+        if (randomRotationAxis == DecalRotationAxis.FORWARD) {
             randomRotation = Quaternion.AngleAxis(randomAngle, Vector3.forward);
-        }
-        else if (randomRotationAxis == DecalRotationAxis.SIDE)
-        {
+        } else if (randomRotationAxis == DecalRotationAxis.SIDE) {
             randomRotation = Quaternion.AngleAxis(randomAngle, Vector3.right);
         }
 
@@ -246,16 +209,13 @@ private void spawnDecal(
         decalCopy.transform.localScale = decalScale;
 
         var mr = decalCopy.GetComponent<MeshRenderer>();
-        if (transparent && mr && mr.enabled)
-        {
+        if (transparent && mr && mr.enabled) {
             mr.material.SetInt("_StencilRef", this.stencilWriteValue);
         }
         // Not needed if deffered decal prefab is correctly set with  _StencilRef to 1 in material
-        else
-        {
+        else {
             var decal = decalCopy.GetComponent<DeferredDecal>();
-            if (decal)
-            {
+            if (decal) {
                 decal.material.SetInt("_StencilRef", this.stencilWriteValue);
             }
         }
diff --git a/unity/Assets/Scripts/DecalSpawner.cs b/unity/Assets/Scripts/DecalSpawner.cs
index c096097442..4688455ea6 100644
--- a/unity/Assets/Scripts/DecalSpawner.cs
+++ b/unity/Assets/Scripts/DecalSpawner.cs
@@ -2,22 +2,19 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class DirtCoordinateBounds
-{
+public class DirtCoordinateBounds {
     public float minX,
         maxX,
         minZ,
         maxZ;
 }
 
-public class DirtSpawnPosition
-{
+public class DirtSpawnPosition {
     public float x;
     public float z;
 }
 
-public class DecalSpawner : MonoBehaviour
-{
+public class DecalSpawner : MonoBehaviour {
     // If true Guarantees that other spawn planes under the same parent will have the same stencil value
     [SerializeField]
     private bool sameStencilAsSiblings = false;
@@ -46,34 +43,26 @@ public class DecalSpawner : MonoBehaviour
 
     private static int currentStencilId = 0;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         //breakType = BreakType.Decal;
         prevTime = Time.time;
 
         var mr = this.GetComponent<MeshRenderer>();
-        if (mr && mr.enabled)
-        {
-            if (transparent)
-            {
-                if (!sameStencilAsSiblings)
-                {
+        if (mr && mr.enabled) {
+            if (transparent) {
+                if (!sameStencilAsSiblings) {
                     setStencilWriteValue(mr);
-                }
-                else
-                {
+                } else {
                     var otherPlanes =
                         this.transform.parent.gameObject.GetComponentsInChildren<DecalSpawner>();
                     // var otherPlanes = this.gameObject.GetComponentsInParent<DecalCollision>();
                     // Debug.Log("other planes id " + this.stencilWriteValue + " len " + otherPlanes.Length);
-                    foreach (var spawnPlane in otherPlanes)
-                    {
+                    foreach (var spawnPlane in otherPlanes) {
                         if (
                             spawnPlane.isActiveAndEnabled
                             && spawnPlane.stencilSet
                             && spawnPlane.sameStencilAsSiblings
-                        )
-                        {
+                        ) {
                             this.stencilWriteValue = spawnPlane.stencilWriteValue;
                             this.stencilSet = true;
                             mr.material.SetInt("_StencilRef", this.stencilWriteValue);
@@ -81,14 +70,11 @@ void OnEnable()
                             break;
                         }
                     }
-                    if (!stencilSet)
-                    {
+                    if (!stencilSet) {
                         setStencilWriteValue(mr);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 this.stencilWriteValue = 1;
                 mr.material.SetInt("_StencilRef", this.stencilWriteValue);
             }
@@ -97,8 +83,7 @@ void OnEnable()
 
     public void Update() { }
 
-    public DirtCoordinateBounds GetDirtCoordinateBounds()
-    {
+    public DirtCoordinateBounds GetDirtCoordinateBounds() {
         DirtCoordinateBounds coords = new DirtCoordinateBounds();
 
         SimObjPhysics myParentSimObj = this.transform.GetComponentInParent<SimObjPhysics>();
@@ -111,25 +96,20 @@ public DirtCoordinateBounds GetDirtCoordinateBounds()
         coords.minZ = spawnPointsArray[0].z;
         coords.maxZ = spawnPointsArray[0].z;
 
-        foreach (Vector3 v in spawnPointsArray)
-        {
-            if (v.x < coords.minX)
-            {
+        foreach (Vector3 v in spawnPointsArray) {
+            if (v.x < coords.minX) {
                 coords.minX = v.x;
             }
 
-            if (v.x > coords.maxX)
-            {
+            if (v.x > coords.maxX) {
                 coords.maxX = v.x;
             }
 
-            if (v.z < coords.minZ)
-            {
+            if (v.z < coords.minZ) {
                 coords.minZ = v.z;
             }
 
-            if (v.z > coords.maxZ)
-            {
+            if (v.z > coords.maxZ) {
                 coords.maxZ = v.z;
             }
         }
@@ -148,16 +128,13 @@ public void SpawnDirt(
         int howMany = 1,
         int randomSeed = 0,
         DirtSpawnPosition[] spawnPointsArray = null
-    )
-    {
-        if (spawnPointsArray == null)
-        {
+    ) {
+        if (spawnPointsArray == null) {
             DirtCoordinateBounds c = GetDirtCoordinateBounds();
 
             Random.InitState(randomSeed);
 
-            for (int i = 0; i < howMany; i++)
-            {
+            for (int i = 0; i < howMany; i++) {
                 //var randomPoint = Random.Range(0, spawnPointsArray.Length);
                 var randomX = Random.Range(c.minX, c.maxX);
                 var randomZ = Random.Range(c.minZ, c.maxZ);
@@ -183,12 +160,10 @@ public void SpawnDirt(
         //instead pass in exact coordinates you want to spawn decals
         //note this ignores the howMany variable, instead will spawn
         //decals based on exactly what spawn points are passed in via spawnPointsArray
-        else
-        {
+        else {
             Random.InitState(randomSeed);
 
-            for (int i = 0; i < spawnPointsArray.Length; i++)
-            {
+            for (int i = 0; i < spawnPointsArray.Length; i++) {
                 var randomScale = new Vector3(
                     Random.Range(0.1f, 0.4f),
                     Random.Range(0.1f, 0.4f),
@@ -210,12 +185,10 @@ public void SpawnDirt(
         }
     }
 
-    private void setStencilWriteValue(MeshRenderer mr)
-    {
+    private void setStencilWriteValue(MeshRenderer mr) {
         DecalSpawner.currentStencilId = DecalSpawner.currentStencilId + 1;
         this.stencilWriteValue = DecalSpawner.currentStencilId << 1;
-        if (this.stencilWriteValue > 0xFF)
-        {
+        if (this.stencilWriteValue > 0xFF) {
             this.stencilWriteValue = this.stencilWriteValue % 0xFF;
             // Debug.LogWarning("Stencil buffer write value overflow with: " + this.stencilWriteValue + " for " + this.gameObject.name + " wraping back to " + ", decal overlap with other spawn planes with same stencil value.");
         }
@@ -229,11 +202,9 @@ public void SpawnDecal(
         bool worldSpace = false,
         Vector3? scale = null,
         DecalRotationAxis randomRotationAxis = DecalRotationAxis.NONE
-    )
-    {
+    ) {
         var pos = position;
-        if (worldSpace)
-        {
+        if (worldSpace) {
             pos = this.transform.InverseTransformPoint(position);
         }
         spawnDecal(
@@ -250,29 +221,23 @@ private void spawnDecal(
         Vector3 scale,
         DecalRotationAxis randomRotationAxis = DecalRotationAxis.NONE,
         int index = -1
-    )
-    {
+    ) {
         var minimumScale = this.transform.localScale;
         var decalScale = scale;
-        if (minimumScale.x < scale.x || minimumScale.y < scale.y)
-        {
+        if (minimumScale.x < scale.x || minimumScale.y < scale.y) {
             var minimumDim = Mathf.Min(minimumScale.x, minimumScale.y);
             decalScale = new Vector3(minimumDim, minimumDim, scale.z);
         }
         var selectIndex = index;
-        if (index < 0)
-        {
+        if (index < 0) {
             selectIndex = Random.Range(0, decals.Length);
         }
 
         var randomRotation = Quaternion.identity;
         var randomAngle = Random.Range(-180.0f, 180.0f);
-        if (randomRotationAxis == DecalRotationAxis.FORWARD)
-        {
+        if (randomRotationAxis == DecalRotationAxis.FORWARD) {
             randomRotation = Quaternion.AngleAxis(randomAngle, Vector3.forward);
-        }
-        else if (randomRotationAxis == DecalRotationAxis.SIDE)
-        {
+        } else if (randomRotationAxis == DecalRotationAxis.SIDE) {
             randomRotation = Quaternion.AngleAxis(randomAngle, Vector3.right);
         }
 
@@ -285,16 +250,13 @@ private void spawnDecal(
         decalCopy.transform.localScale = decalScale;
 
         var mr = decalCopy.GetComponent<MeshRenderer>();
-        if (transparent && mr && mr.enabled)
-        {
+        if (transparent && mr && mr.enabled) {
             mr.material.SetInt("_StencilRef", this.stencilWriteValue);
         }
         // Not needed if deffered decal prefab is correctly set with  _StencilRef to 1 in material
-        else
-        {
+        else {
             var decal = decalCopy.GetComponent<DeferredDecal>();
-            if (decal)
-            {
+            if (decal) {
                 decal.material.SetInt("_StencilRef", this.stencilWriteValue);
             }
         }
diff --git a/unity/Assets/Scripts/DeferredDecal.cs b/unity/Assets/Scripts/DeferredDecal.cs
index abfb447779..901600a3b7 100644
--- a/unity/Assets/Scripts/DeferredDecal.cs
+++ b/unity/Assets/Scripts/DeferredDecal.cs
@@ -4,8 +4,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 
-public enum DecalType
-{
+public enum DecalType {
     DIFFUSE_ONLY,
     EMISSIVE_SPECULAR,
     NORMAL_DIFFUSE,
@@ -13,8 +12,7 @@ public enum DecalType
     FORWARD // TODO: not supported
 }
 
-public class DeferredDecal : MonoBehaviour
-{
+public class DeferredDecal : MonoBehaviour {
     [SerializeField]
     public Material material;
 
@@ -30,8 +28,7 @@ public class DeferredDecal : MonoBehaviour
 
     private List<Camera> cameras;
 
-    void Start()
-    {
+    void Start() {
         this.buffer = new CommandBuffer();
         buffer.name = "Deferred Decals";
         var sceneM = GameObject.Find("PhysicsSceneManager");
@@ -44,24 +41,20 @@ void Start()
         this.cameras = new List<Camera>() { manager.primaryAgent.m_Camera }
             .Concat(manager.thirdPartyCameras)
             .ToList();
-        foreach (var cam in cameras)
-        {
+        foreach (var cam in cameras) {
             cam.AddCommandBuffer(atRenderEvent, buffer);
         }
     }
 
-    public void OnWillRenderObject()
-    {
+    public void OnWillRenderObject() {
         // Happens when editor swap in code
-        if (buffer == null)
-        {
+        if (buffer == null) {
             buffer = new CommandBuffer();
             buffer.name = "Deferred Decals";
         }
         buffer.Clear();
 
-        if (type == DecalType.EMISSIVE_SPECULAR)
-        {
+        if (type == DecalType.EMISSIVE_SPECULAR) {
             // Diffuse + specular decals
             RenderTargetIdentifier[] multipleRenderTargets =
             {
@@ -70,9 +63,7 @@ public void OnWillRenderObject()
                 BuiltinRenderTextureType.GBuffer3
             };
             buffer.SetRenderTarget(multipleRenderTargets, BuiltinRenderTextureType.CameraTarget);
-        }
-        else if (type == DecalType.NORMAL_DIFFUSE)
-        {
+        } else if (type == DecalType.NORMAL_DIFFUSE) {
             // For decals that have normals
             RenderTargetIdentifier[] multipleRenderTargets =
             {
@@ -80,9 +71,7 @@ public void OnWillRenderObject()
                 BuiltinRenderTextureType.GBuffer2
             };
             buffer.SetRenderTarget(multipleRenderTargets, BuiltinRenderTextureType.CameraTarget);
-        }
-        else if (type == DecalType.EMISSIVE_SPECULAR)
-        {
+        } else if (type == DecalType.EMISSIVE_SPECULAR) {
             // All render targets
             RenderTargetIdentifier[] multipleRenderTargets =
             {
@@ -92,17 +81,13 @@ public void OnWillRenderObject()
                 BuiltinRenderTextureType.GBuffer3
             };
             buffer.SetRenderTarget(multipleRenderTargets, BuiltinRenderTextureType.CameraTarget);
-        }
-        else if (type == DecalType.DIFFUSE_ONLY)
-        {
+        } else if (type == DecalType.DIFFUSE_ONLY) {
             // Diffuse only, no MTR
             buffer.SetRenderTarget(
                 BuiltinRenderTextureType.GBuffer0,
                 BuiltinRenderTextureType.CameraTarget
             );
-        }
-        else if (type == DecalType.FORWARD)
-        {
+        } else if (type == DecalType.FORWARD) {
             buffer.SetRenderTarget(
                 BuiltinRenderTextureType.CurrentActive,
                 BuiltinRenderTextureType.CameraTarget
@@ -112,16 +97,13 @@ public void OnWillRenderObject()
         buffer.DrawMesh(this.cubeMesh, this.transform.localToWorldMatrix, this.material);
     }
 
-    private void OnDisable()
-    {
-        foreach (var cam in cameras)
-        {
+    private void OnDisable() {
+        foreach (var cam in cameras) {
             cam.RemoveCommandBuffer(atRenderEvent, buffer);
         }
     }
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = new Color(1, 0.92f, 0.016f, 0.2f);
         Gizmos.DrawMesh(
             this.cubeMesh,
@@ -140,10 +122,8 @@ void OnDrawGizmos()
             new Vector3(+0.5f, -0.5f, +0.5f)
         };
 
-        for (var i = 0; i < 4; i++)
-        {
-            for (var j = 0; j < 3; j++)
-            {
+        for (var i = 0; i < 4; i++) {
+            for (var j = 0; j < 3; j++) {
                 var from = basePoints[i];
                 var to = from;
                 to[j] += -Mathf.Sign(to[j]) * 1.0f;
diff --git a/unity/Assets/Scripts/DirtAndWrite.cs b/unity/Assets/Scripts/DirtAndWrite.cs
index ef5f0c4035..dd9476eaaa 100644
--- a/unity/Assets/Scripts/DirtAndWrite.cs
+++ b/unity/Assets/Scripts/DirtAndWrite.cs
@@ -10,8 +10,7 @@
 using UnityEditor.SceneManagement;
 #endif
 
-public class DirtAndWrite : MonoBehaviour
-{
+public class DirtAndWrite : MonoBehaviour {
     // Start is called before the first frame update
     void Start() { }
 
diff --git a/unity/Assets/Scripts/Dirty.cs b/unity/Assets/Scripts/Dirty.cs
index de69b5eb14..92db8bf9d8 100644
--- a/unity/Assets/Scripts/Dirty.cs
+++ b/unity/Assets/Scripts/Dirty.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Dirty : MonoBehaviour
-{
+public class Dirty : MonoBehaviour {
     [SerializeField]
     public SwapObjList[] MaterialSwapObjects; // put objects that need amterial swaps here, use OnMaterials for Dirty, OffMaterials for Clean
 
@@ -16,64 +15,52 @@ public class Dirty : MonoBehaviour
     [SerializeField]
     protected bool isDirty = false;
 
-    public bool IsDirty()
-    {
+    public bool IsDirty() {
         return isDirty;
     }
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
 #if UNITY_EDITOR
         if (
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeDirty)
-        )
-        {
+        ) {
             Debug.LogError(gameObject.name + " is missing the CanBeDirty secondary property!");
         }
 #endif
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // if(Input.GetKeyDown(KeyCode.G))
         // {
         //     ToggleCleanOrDirty();
         // }
     }
 
-    public void ToggleCleanOrDirty()
-    {
+    public void ToggleCleanOrDirty() {
         // if clean make dirty
-        if (!isDirty)
-        {
+        if (!isDirty) {
             // swap all material swap objects to OnMaterials
-            if (MaterialSwapObjects.Length > 0)
-            {
-                for (int i = 0; i < MaterialSwapObjects.Length; i++)
-                {
+            if (MaterialSwapObjects.Length > 0) {
+                for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                     MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                         MaterialSwapObjects[i].OnMaterials;
                 }
             }
 
             // disable disable all clean objects
-            if (ObjectsToEnableIfClean.Length > 0)
-            {
-                for (int i = 0; i < ObjectsToEnableIfClean.Length; i++)
-                {
+            if (ObjectsToEnableIfClean.Length > 0) {
+                for (int i = 0; i < ObjectsToEnableIfClean.Length; i++) {
                     ObjectsToEnableIfClean[i].SetActive(false);
                 }
             }
 
             // enable all dirty objects
-            if (ObjectsToEnableIfDirty.Length > 0)
-            {
-                for (int i = 0; i < ObjectsToEnableIfDirty.Length; i++)
-                {
+            if (ObjectsToEnableIfDirty.Length > 0) {
+                for (int i = 0; i < ObjectsToEnableIfDirty.Length; i++) {
                     ObjectsToEnableIfDirty[i].SetActive(true);
                 }
             }
@@ -81,32 +68,25 @@ public void ToggleCleanOrDirty()
             isDirty = true;
         }
         // if dirt, make clean
-        else
-        {
+        else {
             // swap all material swap object to OffMaterials
-            if (MaterialSwapObjects.Length > 0)
-            {
-                for (int i = 0; i < MaterialSwapObjects.Length; i++)
-                {
+            if (MaterialSwapObjects.Length > 0) {
+                for (int i = 0; i < MaterialSwapObjects.Length; i++) {
                     MaterialSwapObjects[i].MyObject.GetComponent<MeshRenderer>().materials =
                         MaterialSwapObjects[i].OffMaterials;
                 }
             }
 
             // enable all clean objects
-            if (ObjectsToEnableIfClean.Length > 0)
-            {
-                for (int i = 0; i < ObjectsToEnableIfClean.Length; i++)
-                {
+            if (ObjectsToEnableIfClean.Length > 0) {
+                for (int i = 0; i < ObjectsToEnableIfClean.Length; i++) {
                     ObjectsToEnableIfClean[i].SetActive(true);
                 }
             }
 
             // disable all dirty objects
-            if (ObjectsToEnableIfDirty.Length > 0)
-            {
-                for (int i = 0; i < ObjectsToEnableIfDirty.Length; i++)
-                {
+            if (ObjectsToEnableIfDirty.Length > 0) {
+                for (int i = 0; i < ObjectsToEnableIfDirty.Length; i++) {
                     ObjectsToEnableIfDirty[i].SetActive(false);
                 }
             }
@@ -116,11 +96,9 @@ public void ToggleCleanOrDirty()
     }
 
     // similar to Fire and Candles, if touching water and this object is dirty, auto toggle to clean
-    public void OnTriggerStay(Collider other)
-    {
+    public void OnTriggerStay(Collider other) {
         // only clean the object if touching a running water zone (tagged Liquid). Object will not be cleaned if touching standing, still water.
-        if (isDirty && other.CompareTag("Liquid"))
-        {
+        if (isDirty && other.CompareTag("Liquid")) {
             ToggleCleanOrDirty();
         }
     }
diff --git a/unity/Assets/Scripts/DiscreteHidenSeekAgentController.cs b/unity/Assets/Scripts/DiscreteHidenSeekAgentController.cs
index 2d678d3a64..354b1045a5 100644
--- a/unity/Assets/Scripts/DiscreteHidenSeekAgentController.cs
+++ b/unity/Assets/Scripts/DiscreteHidenSeekAgentController.cs
@@ -4,17 +4,14 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [Serializable]
-    public class ObjectSpanwMetadata
-    {
+    public class ObjectSpanwMetadata {
         public string objectType;
         public int objectVariation;
     }
 
-    public class DiscreteHidenSeekgentController : MonoBehaviour
-    {
+    public class DiscreteHidenSeekgentController : MonoBehaviour {
         [SerializeField]
         private float HandMoveMagnitude = 0.1f;
         public PhysicsRemoteFPSAgentController PhysicsController = null;
@@ -27,8 +24,7 @@ public class DiscreteHidenSeekgentController : MonoBehaviour
         public string onlyPickableObjectId = null;
         public bool disableCollistionWithPickupObject = false;
 
-        void Start()
-        {
+        void Start() {
             var Debug_Canvas = GameObject.Find("DebugCanvasPhysics");
             AgentManager agentManager = GameObject
                 .Find("PhysicsSceneManager")
@@ -54,42 +50,35 @@ void Start()
             // SpawnObjectToHide("{\"objectType\": \"Plunger\", \"objectVariation\": 1}");
         }
 
-        public void OnEnable()
-        {
+        public void OnEnable() {
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
             throwForceBar = GameObject.Find("DebugCanvasPhysics/ThrowForceBar");
             var camera = GetComponentInChildren<Camera>();
             camera.fieldOfView = 90.0f;
             // camera.transform.rotation = Quaternion.Euler(30, 0, 0);
             camera.transform.Rotate(30, 0, 0);
-            if (InputMode_Text)
-            {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "Point and Click Mode";
             }
-            if (throwForceBar)
-            {
+            if (throwForceBar) {
                 throwForceBar.SetActive(false);
             }
             // InputFieldObj = GameObject.Find("DebugCanvasPhysics/InputField");
             // TODO: move debug input field script from, Input Field and disable here
         }
 
-        public void OnDisable()
-        {
-            if (throwForceBar)
-            {
+        public void OnDisable() {
+            if (throwForceBar) {
                 throwForceBar.SetActive(true);
             }
             // TODO: move debug input field script from, Input Field and enable here
         }
 
-        public void SpawnObjectToHide(string objectMeta)
-        {
+        public void SpawnObjectToHide(string objectMeta) {
             var objectData = new ObjectSpanwMetadata();
             Debug.Log(objectMeta);
             JsonUtility.FromJsonOverwrite(objectMeta, objectData);
-            ServerAction action = new ServerAction()
-            {
+            ServerAction action = new ServerAction() {
                 action = "CreateObject",
                 objectType = objectData.objectType,
                 objectVariation = objectData.objectVariation
@@ -100,73 +89,59 @@ public void SpawnObjectToHide(string objectMeta)
             // DisableObjectCollisionWithAgent(onlyPickableObjectId);
         }
 
-        public void SetOnlyPickableObject(string objectId)
-        {
+        public void SetOnlyPickableObject(string objectId) {
             onlyPickableObjectId = objectId;
             this.highlightController.SetOnlyPickableId(objectId);
         }
 
-        public void SetOnlyObjectId(string objectId)
-        {
+        public void SetOnlyObjectId(string objectId) {
             onlyPickableObjectId = objectId;
             this.highlightController.SetOnlyPickableId(objectId);
         }
 
-        public void SetOnlyObjectIdSeeker(string objectId)
-        {
+        public void SetOnlyObjectIdSeeker(string objectId) {
             onlyPickableObjectId = objectId;
             this.highlightController.SetOnlyPickableId(objectId, true);
         }
 
-        public void SpawnAgent(int randomSeed)
-        {
-            ServerAction action = new ServerAction()
-            {
+        public void SpawnAgent(int randomSeed) {
+            ServerAction action = new ServerAction() {
                 action = "RandomlyMoveAgent",
                 randomSeed = randomSeed
             };
             PhysicsController.ProcessControlCommand(action);
         }
 
-        public void DisableObjectCollisionWithAgent(string objectId)
-        {
+        public void DisableObjectCollisionWithAgent(string objectId) {
             var physicsSceneManager = FindObjectOfType<PhysicsSceneManager>();
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 return;
             }
 
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
             disableCollistionWithPickupObject = true;
-            foreach (Collider c0 in this.GetComponentsInChildren<Collider>())
-            {
-                foreach (Collider c1 in target.GetComponentsInChildren<Collider>())
-                {
+            foreach (Collider c0 in this.GetComponentsInChildren<Collider>()) {
+                foreach (Collider c1 in target.GetComponentsInChildren<Collider>()) {
                     Physics.IgnoreCollision(c0, c1);
                 }
             }
         }
 
-        public void SetObjectVisible(bool visible)
-        {
+        public void SetObjectVisible(bool visible) {
             visibleObject = visible;
             // Debug.Log("Calling disply with "+ visibleObject);
             var go = PhysicsController.WhatAmIHolding();
             PhysicsController.UpdateDisplayGameObject(go, visibleObject);
             var layer = go.layer;
-            if (!visibleObject)
-            {
+            if (!visibleObject) {
                 // go.layer = LayerMask.NameToLayer("SimObjInvisible");
                 SetLayerRecursively(go, LayerMask.NameToLayer("SimObjInvisible"));
-            }
-            else
-            {
+            } else {
                 SetLayerRecursively(go, LayerMask.NameToLayer("SimObjVisible"));
             }
         }
 
-        public void Step(string serverAction)
-        {
+        public void Step(string serverAction) {
             ServerAction controlCommand = new ServerAction();
             JsonUtility.FromJsonOverwrite(serverAction, controlCommand);
             PhysicsController.ProcessControlCommand(controlCommand);
@@ -178,43 +153,36 @@ public void Step(string serverAction)
         //     PhysicsController.ProcessControlCommand(command);
         // }
 
-        void Update()
-        {
+        void Update() {
             highlightController.UpdateHighlightedObject(Input.mousePosition);
             highlightController.MouseControls();
 
-            if (PhysicsController.ReadyForCommand)
-            {
+            if (PhysicsController.ReadyForCommand) {
                 handMode = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift);
                 float WalkMagnitude = 0.25f;
-                if (!handMode && !hidingPhase)
-                {
-                    if (Input.GetKeyDown(KeyCode.W))
-                    {
+                if (!handMode && !hidingPhase) {
+                    if (Input.GetKeyDown(KeyCode.W)) {
                         ServerAction action = new ServerAction();
                         action.action = "MoveAhead";
                         action.moveMagnitude = WalkMagnitude;
                         PhysicsController.ProcessControlCommand(action);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.S))
-                    {
+                    if (Input.GetKeyDown(KeyCode.S)) {
                         ServerAction action = new ServerAction();
                         action.action = "MoveBack";
                         action.moveMagnitude = WalkMagnitude;
                         PhysicsController.ProcessControlCommand(action);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.A))
-                    {
+                    if (Input.GetKeyDown(KeyCode.A)) {
                         ServerAction action = new ServerAction();
                         action.action = "MoveLeft";
                         action.moveMagnitude = WalkMagnitude;
                         PhysicsController.ProcessControlCommand(action);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.D))
-                    {
+                    if (Input.GetKeyDown(KeyCode.D)) {
                         ServerAction action = new ServerAction();
                         action.action = "MoveRight";
                         action.moveMagnitude = WalkMagnitude;
@@ -240,39 +208,25 @@ void Update()
                     }
                 }
 
-                if (this.PhysicsController.WhatAmIHolding() != null && handMode)
-                {
+                if (this.PhysicsController.WhatAmIHolding() != null && handMode) {
                     var actionName = "MoveHandForce";
                     var localPos = new Vector3(0, 0, 0);
                     // Debug.Log(" Key down shift ? " + Input.GetKey(KeyCode.LeftAlt) + " up " + Input.GetKeyDown(KeyCode.UpArrow));
-                    if (Input.GetKeyDown(KeyCode.W))
-                    {
+                    if (Input.GetKeyDown(KeyCode.W)) {
                         localPos.y += HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.S))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.S)) {
                         localPos.y -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.UpArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.UpArrow)) {
                         localPos.z += HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.DownArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.DownArrow)) {
                         localPos.z -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.LeftArrow) || Input.GetKeyDown(KeyCode.A))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.LeftArrow) || Input.GetKeyDown(KeyCode.A)) {
                         localPos.x -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.RightArrow) || Input.GetKeyDown(KeyCode.D))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.RightArrow) || Input.GetKeyDown(KeyCode.D)) {
                         localPos.x += HandMoveMagnitude;
                     }
-                    if (actionName != "" && localPos.sqrMagnitude > 0)
-                    {
-                        ServerAction action = new ServerAction
-                        {
+                    if (actionName != "" && localPos.sqrMagnitude > 0) {
+                        ServerAction action = new ServerAction {
                             action = "MoveHandForce",
                             x = localPos.x,
                             y = localPos.y,
@@ -281,26 +235,20 @@ void Update()
                         this.PhysicsController.ProcessControlCommand(action);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.Space))
-                    {
+                    if (Input.GetKeyDown(KeyCode.Space)) {
                         SetObjectVisible(true);
-                        var action = new ServerAction
-                        {
+                        var action = new ServerAction {
                             action = "DropHandObject",
                             forceAction = true
                         };
                         this.PhysicsController.ProcessControlCommand(action);
                     }
-                }
-                else if (handMode)
-                {
-                    if (Input.GetKeyDown(KeyCode.Space))
-                    {
+                } else if (handMode) {
+                    if (Input.GetKeyDown(KeyCode.Space)) {
                         var withinReach =
                             PhysicsController.FindObjectInVisibleSimObjPhysics(onlyPickableObjectId)
                             != null;
-                        if (withinReach)
-                        {
+                        if (withinReach) {
                             ServerAction action = new ServerAction();
                             action.objectId = onlyPickableObjectId;
                             action.action = "PickupObject";
@@ -314,44 +262,34 @@ void Update()
                         || Input.GetKeyDown(KeyCode.C)
                         || Input.GetKeyDown(KeyCode.RightControl)
                     ) && PhysicsController.ReadyForCommand
-                )
-                {
+                ) {
                     ServerAction action = new ServerAction();
-                    if (this.PhysicsController.isStanding())
-                    {
+                    if (this.PhysicsController.isStanding()) {
                         action.action = "Crouch";
                         PhysicsController.ProcessControlCommand(action);
-                    }
-                    else
-                    {
+                    } else {
                         action.action = "Stand";
                         PhysicsController.ProcessControlCommand(action);
                     }
                 }
 
-                if (PhysicsController.WhatAmIHolding() != null)
-                {
-                    if (Input.GetKeyDown(KeyCode.Space) && !hidingPhase && !handMode)
-                    {
+                if (PhysicsController.WhatAmIHolding() != null) {
+                    if (Input.GetKeyDown(KeyCode.Space) && !hidingPhase && !handMode) {
                         SetObjectVisible(!visibleObject);
                     }
                 }
             }
         }
 
-        private static void SetLayerRecursively(GameObject obj, int newLayer)
-        {
-            if (null == obj)
-            {
+        private static void SetLayerRecursively(GameObject obj, int newLayer) {
+            if (null == obj) {
                 return;
             }
 
             obj.layer = newLayer;
 
-            foreach (Transform child in obj.transform)
-            {
-                if (null == child)
-                {
+            foreach (Transform child in obj.transform) {
+                if (null == child) {
                     continue;
                 }
                 SetLayerRecursively(child.gameObject, newLayer);
diff --git a/unity/Assets/Scripts/DiscretePointClickAgentController.cs b/unity/Assets/Scripts/DiscretePointClickAgentController.cs
index 9638e15db2..f6f0dfb8d9 100644
--- a/unity/Assets/Scripts/DiscretePointClickAgentController.cs
+++ b/unity/Assets/Scripts/DiscretePointClickAgentController.cs
@@ -3,10 +3,8 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class DiscretePointClickAgentController : MonoBehaviour
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class DiscretePointClickAgentController : MonoBehaviour {
         [SerializeField]
         private float HandMoveMagnitude = 0.1f;
         public PhysicsRemoteFPSAgentController PhysicsController = null;
@@ -15,8 +13,7 @@ public class DiscretePointClickAgentController : MonoBehaviour
         private GameObject throwForceBar = null;
         private bool handMode = false;
 
-        void Start()
-        {
+        void Start() {
             var Debug_Canvas = GameObject.Find("DebugCanvasPhysics");
             AgentManager agentManager = GameObject
                 .Find("PhysicsSceneManager")
@@ -36,16 +33,13 @@ void Start()
             );
         }
 
-        public void OnEnable()
-        {
+        public void OnEnable() {
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
             throwForceBar = GameObject.Find("DebugCanvasPhysics/ThrowForceBar");
-            if (InputMode_Text)
-            {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "Point and Click Mode";
             }
-            if (throwForceBar)
-            {
+            if (throwForceBar) {
                 throwForceBar.SetActive(false);
             }
 
@@ -53,67 +47,54 @@ public void OnEnable()
             // TODO: move debug input field script from, Input Field and disable here
         }
 
-        public void OnDisable()
-        {
-            if (throwForceBar)
-            {
+        public void OnDisable() {
+            if (throwForceBar) {
                 throwForceBar.SetActive(true);
             }
             // TODO: move debug input field script from, Input Field and enable here
         }
 
-        private void executeAction(string actionName, float moveMagnitude)
-        {
+        private void executeAction(string actionName, float moveMagnitude) {
             Dictionary<string, object> action = new Dictionary<string, object>();
             action["action"] = actionName;
             action["moveMagnitude"] = moveMagnitude;
             PhysicsController.ProcessControlCommand(action);
         }
 
-        private void executeAction(string actionName)
-        {
+        private void executeAction(string actionName) {
             Dictionary<string, object> action = new Dictionary<string, object>();
             action["action"] = actionName;
             PhysicsController.ProcessControlCommand(action);
         }
 
-        void Update()
-        {
+        void Update() {
             highlightController.UpdateHighlightedObject(Input.mousePosition);
             highlightController.MouseControls();
 
-            if (PhysicsController.ReadyForCommand)
-            {
+            if (PhysicsController.ReadyForCommand) {
                 float WalkMagnitude = 0.25f;
-                if (!handMode)
-                {
-                    if (Input.GetKeyDown(KeyCode.W))
-                    {
+                if (!handMode) {
+                    if (Input.GetKeyDown(KeyCode.W)) {
                         executeAction("MoveAhead", WalkMagnitude);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.S))
-                    {
+                    if (Input.GetKeyDown(KeyCode.S)) {
                         executeAction("MoveBack", WalkMagnitude);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.A))
-                    {
+                    if (Input.GetKeyDown(KeyCode.A)) {
                         executeAction("MoveLeft", WalkMagnitude);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.D))
-                    {
+                    if (Input.GetKeyDown(KeyCode.D)) {
                         executeAction("MoveRight", WalkMagnitude);
                     }
 
-                    if (Input.GetKeyDown(KeyCode.UpArrow))
-                    {
+                    if (Input.GetKeyDown(KeyCode.UpArrow)) {
                         executeAction("LookUp");
                     }
 
-                    if (Input.GetKeyDown(KeyCode.DownArrow))
-                    {
+                    if (Input.GetKeyDown(KeyCode.DownArrow)) {
                         executeAction("LookDown");
                     }
 
@@ -128,46 +109,30 @@ void Update()
                     }
                 }
 
-                if (Input.GetKeyDown(KeyCode.LeftShift))
-                {
+                if (Input.GetKeyDown(KeyCode.LeftShift)) {
                     handMode = true;
-                }
-                else if (Input.GetKeyUp(KeyCode.LeftShift))
-                {
+                } else if (Input.GetKeyUp(KeyCode.LeftShift)) {
                     handMode = false;
                 }
 
-                if (this.PhysicsController.WhatAmIHolding() != null && handMode)
-                {
+                if (this.PhysicsController.WhatAmIHolding() != null && handMode) {
                     var actionName = "MoveHandForce";
                     var localPos = new Vector3(0, 0, 0);
                     // Debug.Log(" Key down shift ? " + Input.GetKey(KeyCode.LeftAlt) + " up " + Input.GetKeyDown(KeyCode.UpArrow));
-                    if (Input.GetKeyDown(KeyCode.W))
-                    {
+                    if (Input.GetKeyDown(KeyCode.W)) {
                         localPos.z += HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.S))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.S)) {
                         localPos.z -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.UpArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.UpArrow)) {
                         localPos.y += HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.DownArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.DownArrow)) {
                         localPos.y -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.LeftArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.LeftArrow)) {
                         localPos.x -= HandMoveMagnitude;
-                    }
-                    else if (Input.GetKeyDown(KeyCode.RightArrow))
-                    {
+                    } else if (Input.GetKeyDown(KeyCode.RightArrow)) {
                         localPos.x += HandMoveMagnitude;
                     }
-                    if (actionName != "")
-                    {
+                    if (actionName != "") {
                         Dictionary<string, object> action = new Dictionary<string, object>();
                         action["action"] = actionName;
                         action["x"] = localPos.x;
diff --git a/unity/Assets/Scripts/Door.cs b/unity/Assets/Scripts/Door.cs
index 9fb1c5c3bb..e7a7cdae46 100644
--- a/unity/Assets/Scripts/Door.cs
+++ b/unity/Assets/Scripts/Door.cs
@@ -3,27 +3,22 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Door : MonoBehaviour
-{
+public class Door : MonoBehaviour {
     public SimObj ParentObj;
     public Vector3 OpenRotation;
     public Vector3 ClosedRotation;
     public Transform Pivot;
     public bool EditorOpen;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
@@ -31,11 +26,9 @@ void OnEnable()
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool open = EditorOpen;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             open = ParentObj.Animator.GetBool("AnimState1");
         }
         Pivot.localEulerAngles = open ? OpenRotation : ClosedRotation;
diff --git a/unity/Assets/Scripts/DraggablePoint.cs b/unity/Assets/Scripts/DraggablePoint.cs
index 3fcba5f5e3..43861b29ec 100644
--- a/unity/Assets/Scripts/DraggablePoint.cs
+++ b/unity/Assets/Scripts/DraggablePoint.cs
@@ -8,31 +8,24 @@ public class DraggablePoint : PropertyAttribute { }
 
 #if UNITY_EDITOR
 // [CustomEditor(typeof(MonoBehaviour), true)]
-public class DraggablePointDrawer : Editor
-{
+public class DraggablePointDrawer : Editor {
     readonly GUIStyle style = new GUIStyle();
 
-    void OnEnable()
-    {
+    void OnEnable() {
         style.fontStyle = FontStyle.Bold;
         style.normal.textColor = Color.white;
     }
 
-    public void OnSceneGUI()
-    {
+    public void OnSceneGUI() {
         var property = serializedObject.GetIterator();
-        while (property.Next(true))
-        {
-            if (property.propertyType == SerializedPropertyType.Vector3)
-            {
+        while (property.Next(true)) {
+            if (property.propertyType == SerializedPropertyType.Vector3) {
                 var field = serializedObject.targetObject.GetType().GetField(property.name);
-                if (field == null)
-                {
+                if (field == null) {
                     continue;
                 }
                 var draggablePoints = field.GetCustomAttributes(typeof(DraggablePoint), false);
-                if (draggablePoints.Length > 0)
-                {
+                if (draggablePoints.Length > 0) {
                     Handles.Label(property.vector3Value, property.name);
                     property.vector3Value = Handles.PositionHandle(
                         property.vector3Value,
diff --git a/unity/Assets/Scripts/DroneBasket.cs b/unity/Assets/Scripts/DroneBasket.cs
index 37fa5c2b0b..1353c6fdf3 100644
--- a/unity/Assets/Scripts/DroneBasket.cs
+++ b/unity/Assets/Scripts/DroneBasket.cs
@@ -6,8 +6,7 @@
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
-public class DroneBasket : MonoBehaviour
-{
+public class DroneBasket : MonoBehaviour {
     public GameObject myParent = null;
     private PhysicsSceneManager psManager;
 
@@ -15,25 +14,21 @@ public class DroneBasket : MonoBehaviour
     protected List<SimObjPhysics> CurrentlyContains = new List<SimObjPhysics>();
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         psManager = GameObject.Find("PhysicsSceneManager").GetComponent<PhysicsSceneManager>();
     }
 
     // Update is called once per frame
     void Update() { }
 
-    public void OnTriggerStay(Collider other)
-    {
+    public void OnTriggerStay(Collider other) {
         // from the collider, see if the thing hit is a sim object physics
         // don't detect other trigger colliders to prevent nested objects from containing each other
-        if (other.GetComponentInParent<SimObjPhysics>() && !other.isTrigger)
-        {
+        if (other.GetComponentInParent<SimObjPhysics>() && !other.isTrigger) {
             SimObjPhysics sop = other.GetComponentInParent<SimObjPhysics>();
 
             // don't add any parent objects in case this is a child sim object
-            if (sop.transform == myParent.transform)
-            {
+            if (sop.transform == myParent.transform) {
                 return;
             }
 
@@ -47,8 +42,7 @@ public void OnTriggerStay(Collider other)
                 sop.transform.Find("TriggerColliders").gameObject.SetActive(false);
                 sop.transform.Find("BoundingBox").gameObject.SetActive(false);
 
-                if (sop.GetComponent<Rigidbody>())
-                {
+                if (sop.GetComponent<Rigidbody>()) {
                     Rigidbody rb = sop.GetComponent<Rigidbody>();
 
                     psManager.RemoveFromRBSInScene(rb);
diff --git a/unity/Assets/Scripts/DroneFPSAgentController.cs b/unity/Assets/Scripts/DroneFPSAgentController.cs
index e40570959b..6a916cce30 100644
--- a/unity/Assets/Scripts/DroneFPSAgentController.cs
+++ b/unity/Assets/Scripts/DroneFPSAgentController.cs
@@ -7,11 +7,9 @@
 using UnityEngine.AI;
 using UnityEngine.Rendering.PostProcessing;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [RequireComponent(typeof(CharacterController))]
-    public class DroneFPSAgentController : BaseFPSAgentController
-    {
+    public class DroneFPSAgentController : BaseFPSAgentController {
         public GameObject basket;
         public GameObject basketTrigger;
         public List<SimObjPhysics> caught_object = new List<SimObjPhysics>();
@@ -30,14 +28,12 @@ AgentManager agentManager
         )
             : base(baseAgentComponent, agentManager) { }
 
-        protected override void resumePhysics()
-        {
+        protected override void resumePhysics() {
             if (
                 Time.timeScale == 0
                 && !Physics.autoSimulation
                 && physicsSceneManager.physicsSimulationPaused
-            )
-            {
+            ) {
                 Time.timeScale = this.autoResetTimeScale;
                 Physics.autoSimulation = true;
                 physicsSceneManager.physicsSimulationPaused = false;
@@ -45,8 +41,7 @@ protected override void resumePhysics()
             }
         }
 
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             VisibilityCapsule = DroneVisCap;
             m_CharacterController.center = new Vector3(0, 0, 0);
             m_CharacterController.radius = 0.2f;
@@ -76,28 +71,23 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             return ActionFinished.Success;
         }
 
-        public void MoveLeft(ServerAction action)
-        {
+        public void MoveLeft(ServerAction action) {
             moveCharacter(action, 270);
         }
 
-        public void MoveRight(ServerAction action)
-        {
+        public void MoveRight(ServerAction action) {
             moveCharacter(action, 90);
         }
 
-        public void MoveAhead(ServerAction action)
-        {
+        public void MoveAhead(ServerAction action) {
             moveCharacter(action, 0);
         }
 
-        public void MoveBack(ServerAction action)
-        {
+        public void MoveBack(ServerAction action) {
             moveCharacter(action, 180);
         }
 
-        public void MoveRelative(ServerAction action)
-        {
+        public void MoveRelative(ServerAction action) {
             var moveLocal = new Vector3(action.x, 0, action.z);
             Vector3 moveWorldSpace = transform.rotation * moveLocal;
             moveWorldSpace.y = Physics.gravity.y * this.m_GravityMultiplier;
@@ -105,11 +95,9 @@ public void MoveRelative(ServerAction action)
             actionFinished(true);
         }
 
-        public void RotateRight(ServerAction action)
-        {
+        public void RotateRight(ServerAction action) {
             // if controlCommand.degrees is default (0), rotate by the default rotation amount set on initialize
-            if (action.degrees == 0f)
-            {
+            if (action.degrees == 0f) {
                 action.degrees = rotateStepDegrees;
             }
 
@@ -117,11 +105,9 @@ public void RotateRight(ServerAction action)
             actionFinished(true);
         }
 
-        public void RotateLeft(ServerAction action)
-        {
+        public void RotateLeft(ServerAction action) {
             // if controlCommand.degrees is default (0), rotate by the default rotation amount set on initialize
-            if (action.degrees == 0f)
-            {
+            if (action.degrees == 0f) {
                 action.degrees = rotateStepDegrees;
             }
 
@@ -129,8 +115,7 @@ public void RotateLeft(ServerAction action)
             actionFinished(true);
         }
 
-        public override void FixedUpdate()
-        {
+        public override void FixedUpdate() {
             // when in drone mode, automatically pause time and physics simulation here
             // time and physics will continue once emitFrame is called
             // Note: this is to keep drone and object movement in sync, as pausing just object physics would
@@ -142,22 +127,17 @@ public override void FixedUpdate()
             // it's unclear whether this is only an in-editor debug draw issue, or the actual metadata for the axis
             // aligned box is messed up, but yeah.
 
-            if (hasFixedUpdateHappened)
-            {
+            if (hasFixedUpdateHappened) {
                 Time.timeScale = 0;
                 Physics.autoSimulation = false;
                 physicsSceneManager.physicsSimulationPaused = true;
-            }
-            else
-            {
+            } else {
                 fixupdateCnt++;
                 hasFixedUpdateHappened = true;
             }
 
-            if (thrust.magnitude > 0.0001 && Time.timeScale != 0)
-            {
-                if (dronePositionRandomNoiseSigma > 0)
-                {
+            if (thrust.magnitude > 0.0001 && Time.timeScale != 0) {
+                if (dronePositionRandomNoiseSigma > 0) {
                     var noiseX = (float)
                         systemRandom.NextGaussian(0.0f, dronePositionRandomNoiseSigma / 3.0f);
                     var noiseY = (float)
@@ -166,15 +146,12 @@ public override void FixedUpdate()
                         systemRandom.NextGaussian(0.0f, dronePositionRandomNoiseSigma / 3.0f);
                     Vector3 noise = new Vector3(noiseX, noiseY, noiseZ);
                     m_CharacterController.Move((thrust * Time.fixedDeltaTime) + noise);
-                }
-                else
-                {
+                } else {
                     m_CharacterController.Move(thrust * Time.fixedDeltaTime);
                 }
             }
 
-            if (this.agentState == AgentState.PendingFixedUpdate)
-            {
+            if (this.agentState == AgentState.PendingFixedUpdate) {
                 this.agentState = AgentState.ActionComplete;
             }
         }
@@ -184,8 +161,7 @@ public override ObjectMetadata ObjectMetadataFromSimObjPhysics(
             SimObjPhysics simObj,
             bool isVisible,
             bool isInteractable
-        )
-        {
+        ) {
             DroneObjectMetadata objMeta = new DroneObjectMetadata();
             objMeta.isCaught = this.isObjectCaught(simObj);
             objMeta.numSimObjHits = simObj.numSimObjHit;
@@ -201,51 +177,43 @@ bool isInteractable
             objMeta.receptacle = simObj.IsReceptacle;
 
             objMeta.openable = simObj.IsOpenable;
-            if (objMeta.openable)
-            {
+            if (objMeta.openable) {
                 objMeta.isOpen = simObj.IsOpen;
             }
 
             objMeta.toggleable = simObj.IsToggleable;
-            if (objMeta.toggleable)
-            {
+            if (objMeta.toggleable) {
                 objMeta.isToggled = simObj.IsToggled;
             }
 
             objMeta.breakable = simObj.IsBreakable;
-            if (objMeta.breakable)
-            {
+            if (objMeta.breakable) {
                 objMeta.isBroken = simObj.IsBroken;
             }
 
             objMeta.canFillWithLiquid = simObj.IsFillable;
-            if (objMeta.canFillWithLiquid)
-            {
+            if (objMeta.canFillWithLiquid) {
                 objMeta.isFilledWithLiquid = simObj.IsFilled;
                 objMeta.fillLiquid = simObj.FillLiquid;
             }
 
             objMeta.dirtyable = simObj.IsDirtyable;
-            if (objMeta.dirtyable)
-            {
+            if (objMeta.dirtyable) {
                 objMeta.isDirty = simObj.IsDirty;
             }
 
             objMeta.cookable = simObj.IsCookable;
-            if (objMeta.cookable)
-            {
+            if (objMeta.cookable) {
                 objMeta.isCooked = simObj.IsCooked;
             }
 
             // if the sim object is moveable or pickupable
-            if (simObj.IsPickupable || simObj.IsMoveable)
-            {
+            if (simObj.IsPickupable || simObj.IsMoveable) {
                 // this object should report back mass and salient materials
 
                 string[] salientMaterialsToString = new string[simObj.salientMaterials.Length];
 
-                for (int i = 0; i < simObj.salientMaterials.Length; i++)
-                {
+                for (int i = 0; i < simObj.salientMaterials.Length; i++) {
                     salientMaterialsToString[i] = simObj.salientMaterials[i].ToString();
                 }
 
@@ -253,8 +221,7 @@ bool isInteractable
 
                 // record the mass unless the object was caught by the drone, which means the
                 // rigidbody was disabled
-                if (!objMeta.isCaught)
-                {
+                if (!objMeta.isCaught) {
                     objMeta.mass = simObj.Mass;
                 }
             }
@@ -266,14 +233,12 @@ bool isInteractable
             objMeta.isColdSource = simObj.isColdSource;
 
             objMeta.sliceable = simObj.IsSliceable;
-            if (objMeta.sliceable)
-            {
+            if (objMeta.sliceable) {
                 objMeta.isSliced = simObj.IsSliced;
             }
 
             objMeta.canBeUsedUp = simObj.CanBeUsedUp;
-            if (objMeta.canBeUsedUp)
-            {
+            if (objMeta.canBeUsedUp) {
                 objMeta.isUsedUp = simObj.IsUsedUp;
             }
 
@@ -305,8 +270,7 @@ bool isInteractable
             return objMeta;
         }
 
-        public override MetadataWrapper generateMetadataWrapper()
-        {
+        public override MetadataWrapper generateMetadataWrapper() {
             MetadataWrapper metadata = base.generateMetadataWrapper();
 
             // For Drone controller, currentTime should be based on
@@ -332,14 +296,12 @@ public override MetadataWrapper generateMetadataWrapper()
             return metadata;
         }
 
-        public float DroneTimeSinceStart()
-        {
+        public float DroneTimeSinceStart() {
             return fixupdateCnt * Time.fixedDeltaTime;
         }
 
         // Flying drone agent controls
-        public Vector3 GetFlyingOrientation(float moveMagnitude, int targetOrientation)
-        {
+        public Vector3 GetFlyingOrientation(float moveMagnitude, int targetOrientation) {
             Vector3 m;
             int currentRotation = (int)Math.Round(transform.rotation.eulerAngles.y, 0);
             Dictionary<int, Vector3> actionOrientation = new Dictionary<int, Vector3>();
@@ -349,12 +311,9 @@ public Vector3 GetFlyingOrientation(float moveMagnitude, int targetOrientation)
             actionOrientation.Add(270, new Vector3(-1.0f, 0.0f, 0.0f));
             int delta = (currentRotation + targetOrientation) % 360;
 
-            if (actionOrientation.ContainsKey(delta))
-            {
+            if (actionOrientation.ContainsKey(delta)) {
                 m = actionOrientation[delta];
-            }
-            else
-            {
+            } else {
                 actionOrientation = new Dictionary<int, Vector3>();
                 actionOrientation.Add(0, transform.forward);
                 actionOrientation.Add(90, transform.right);
@@ -370,22 +329,16 @@ public Vector3 GetFlyingOrientation(float moveMagnitude, int targetOrientation)
 
         // Flying drone agent controls
         // use get reachable positions, get two positions, one in front of the other
-        public Vector3[] SeekTwoPos(Vector3[] shuffledCurrentlyReachable)
-        {
+        public Vector3[] SeekTwoPos(Vector3[] shuffledCurrentlyReachable) {
             Vector3[] output = new Vector3[2];
             List<float> y_candidates = new List<float>(new float[] { 1.0f, 1.25f, 1.5f });
-            foreach (Vector3 p in shuffledCurrentlyReachable)
-            {
-                foreach (Vector3 p2 in shuffledCurrentlyReachable)
-                {
-                    if (!p.Equals(p2))
-                    {
-                        if (p2.z >= (p.z + 1.5f) && Mathf.Abs(p.z - p2.z) <= 2.5f)
-                        {
+            foreach (Vector3 p in shuffledCurrentlyReachable) {
+                foreach (Vector3 p2 in shuffledCurrentlyReachable) {
+                    if (!p.Equals(p2)) {
+                        if (p2.z >= (p.z + 1.5f) && Mathf.Abs(p.z - p2.z) <= 2.5f) {
                             // if(Mathf.Abs(p.x-p2.x) < 0.5*Mathf.Abs(p.z-p2.z)){
                             // if(Mathf.Abs(p.x-p2.x) == 0){
-                            if (Mathf.Abs(p.x - p2.x) <= 0.5)
-                            {
+                            if (Mathf.Abs(p.x - p2.x) <= 0.5) {
                                 float y = y_candidates.OrderBy(x => systemRandom.Next()).ToArray()[
                                     0
                                 ];
@@ -401,8 +354,7 @@ public Vector3[] SeekTwoPos(Vector3[] shuffledCurrentlyReachable)
         }
 
         // change what timeScale is automatically reset to on emitFrame when in FlightMode
-        public void ChangeAutoResetTimeScale(float timeScale)
-        {
+        public void ChangeAutoResetTimeScale(float timeScale) {
             autoResetTimeScale = timeScale;
             actionFinished(true);
         }
@@ -412,8 +364,7 @@ public void Teleport(
             Vector3? rotation = null,
             float? horizon = null,
             bool forceAction = false
-        )
-        {
+        ) {
             base.teleport(
                 position: position,
                 rotation: rotation,
@@ -428,8 +379,7 @@ public void TeleportFull(
             Vector3? rotation,
             float? horizon,
             bool forceAction = false
-        )
-        {
+        ) {
             base.teleportFull(
                 position: position,
                 rotation: rotation,
@@ -439,8 +389,7 @@ public void TeleportFull(
             actionFinished(success: true);
         }
 
-        public void FlyRandomStart(float y)
-        {
+        public void FlyRandomStart(float y) {
             Vector3[] shuffledCurrentlyReachable = getReachablePositions()
                 .OrderBy(x => systemRandom.Next())
                 .ToArray();
@@ -457,8 +406,7 @@ public void FlyRandomStart(float y)
 
         // move drone and launcher to some start position
         // using the 'position' variable name is an artifact from using ServerAction.position for the thrust_dt
-        public void FlyAssignStart(Vector3 position, float x, float y, float z)
-        {
+        public void FlyAssignStart(Vector3 position, float x, float y, float z) {
             // drone uses action.position
             Vector3 thrust_dt = position;
             transform.position = thrust_dt;
@@ -472,8 +420,7 @@ public void FlyAssignStart(Vector3 position, float x, float y, float z)
         }
 
         // Flying Drone Agent Controls
-        public void FlyTo(float x, float y, float z, Vector3 rotation, float horizon)
-        {
+        public void FlyTo(float x, float y, float z, Vector3 rotation, float horizon) {
             transform.rotation = Quaternion.Euler(new Vector3(0.0f, rotation.y, 0.0f));
             m_Camera.transform.localEulerAngles = new Vector3(horizon, 0.0f, 0.0f);
             thrust += new Vector3(x, y, z);
@@ -481,36 +428,31 @@ public void FlyTo(float x, float y, float z, Vector3 rotation, float horizon)
         }
 
         // Flying Drone Agent Controls
-        public void FlyAhead(float moveMagnitude)
-        {
+        public void FlyAhead(float moveMagnitude) {
             thrust += GetFlyingOrientation(moveMagnitude, 0);
             actionFinished(true);
         }
 
         // Flying Drone Agent Controls
-        public void FlyBack(float moveMagnitude)
-        {
+        public void FlyBack(float moveMagnitude) {
             thrust += GetFlyingOrientation(moveMagnitude, 180);
             actionFinished(true);
         }
 
         // Flying Drone Agent Controls
-        public void FlyLeft(float moveMagnitude)
-        {
+        public void FlyLeft(float moveMagnitude) {
             thrust += GetFlyingOrientation(moveMagnitude, 270);
             actionFinished(true);
         }
 
         // Flying Drone Agent Controls
-        public void FlyRight(float moveMagnitude)
-        {
+        public void FlyRight(float moveMagnitude) {
             thrust += GetFlyingOrientation(moveMagnitude, 90);
             actionFinished(true);
         }
 
         // Flying Drone Agent Controls
-        public void FlyUp(float moveMagnitude)
-        {
+        public void FlyUp(float moveMagnitude) {
             // Vector3 targetPosition = transform.position + transform.up * action.moveMagnitude;
             // transform.position = targetPosition;
             thrust += new Vector3(0, moveMagnitude, 0);
@@ -518,8 +460,7 @@ public void FlyUp(float moveMagnitude)
         }
 
         // Flying Drone Agent Controls
-        public void FlyDown(float moveMagnitude)
-        {
+        public void FlyDown(float moveMagnitude) {
             // Vector3 targetPosition = transform.position + -transform.up * action.moveMagnitude;
             // transform.position = targetPosition;
             thrust += new Vector3(0, -moveMagnitude, 0);
@@ -535,57 +476,45 @@ public void LaunchDroneObject(
             float x,
             float y,
             float z
-        )
-        {
+        ) {
             Launch(moveMagnitude, objectName, objectRandom, x, y, z);
             actionFinished(true);
             fixupdateCnt = 0f;
         }
 
         // spawn a launcher object at action.position coordinates
-        public void SpawnDroneLauncher(Vector3 position)
-        {
+        public void SpawnDroneLauncher(Vector3 position) {
             SpawnLauncher(position);
             actionFinished(true);
         }
 
         // in case you want to change the fixed delta time
-        public void ChangeFixedDeltaTime(float? fixedDeltaTime = null)
-        {
+        public void ChangeFixedDeltaTime(float? fixedDeltaTime = null) {
             var fdtime = fixedDeltaTime.GetValueOrDefault(Time.fixedDeltaTime);
 
-            if (fdtime > 0)
-            {
+            if (fdtime > 0) {
                 Time.fixedDeltaTime = fdtime;
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "FixedDeltaTime must be >0";
                 actionFinished(false);
             }
         }
 
-        public void ChangeDronePositionRandomNoiseSigma(float dronePositionRandomNoiseSigma = 0.0f)
-        {
+        public void ChangeDronePositionRandomNoiseSigma(float dronePositionRandomNoiseSigma = 0.0f) {
             this.dronePositionRandomNoiseSigma = dronePositionRandomNoiseSigma;
             actionFinished(true);
         }
 
-        public bool HasLaunch(SimObjPhysics obj)
-        {
+        public bool HasLaunch(SimObjPhysics obj) {
             return DroneObjectLauncher.HasLaunch(obj);
         }
 
-        public bool isObjectCaught(SimObjPhysics check_obj)
-        {
+        public bool isObjectCaught(SimObjPhysics check_obj) {
             bool caught_object_bool = false;
-            foreach (SimObjPhysics obj in caught_object)
-            {
-                if (obj.Type == check_obj.Type)
-                {
-                    if (obj.name == check_obj.name)
-                    {
+            foreach (SimObjPhysics obj in caught_object) {
+                if (obj.Type == check_obj.Type) {
+                    if (obj.name == check_obj.name) {
                         caught_object_bool = true;
                         // Debug.Log("catch!!!");
                         break;
@@ -602,24 +531,20 @@ public void Launch(
             float x,
             float y,
             float z
-        )
-        {
+        ) {
             Vector3 LaunchAngle = new Vector3(x, y, z);
             DroneObjectLauncher.Launch(this, moveMagnitude, LaunchAngle, objectName, objectRandom);
         }
 
-        public void MoveLauncher(Vector3 position)
-        {
+        public void MoveLauncher(Vector3 position) {
             DroneObjectLauncher.transform.position = position;
         }
 
-        public Vector3 GetLauncherPosition()
-        {
+        public Vector3 GetLauncherPosition() {
             return DroneObjectLauncher.transform.position;
         }
 
-        public void SpawnLauncher(Vector3 position)
-        {
+        public void SpawnLauncher(Vector3 position) {
             UnityEngine.Object.Instantiate(DroneObjectLauncher, position, Quaternion.identity);
         }
     }
diff --git a/unity/Assets/Scripts/DroneObjectLauncher.cs b/unity/Assets/Scripts/DroneObjectLauncher.cs
index 24e2883ec3..9bfd4ac392 100644
--- a/unity/Assets/Scripts/DroneObjectLauncher.cs
+++ b/unity/Assets/Scripts/DroneObjectLauncher.cs
@@ -4,8 +4,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class DroneObjectLauncher : MonoBehaviour
-{
+public class DroneObjectLauncher : MonoBehaviour {
     [SerializeField]
     public GameObject[] prefabsToLaunch;
 
@@ -18,34 +17,28 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    public bool HasLaunch(SimObjPhysics obj)
-    {
+    public bool HasLaunch(SimObjPhysics obj) {
         return launch_object.Contains(obj);
     }
 
-    public GameObject GetGameObject(string objectType, bool randomize, int variation)
-    {
+    public GameObject GetGameObject(string objectType, bool randomize, int variation) {
         List<GameObject> candidates = new List<GameObject>();
 
         SimObjType target = (SimObjType)Enum.Parse(typeof(SimObjType), objectType);
         // Debug.Log(target);
-        foreach (GameObject go in prefabsToLaunch)
-        {
+        foreach (GameObject go in prefabsToLaunch) {
             // Debug.Log(go.GetComponent<SimObjPhysics>().Type);
             // does a prefab of objectType exist in the current array of prefabs to spawn?
-            if (go.GetComponent<SimObjPhysics>().Type == target)
-            {
+            if (go.GetComponent<SimObjPhysics>().Type == target) {
                 candidates.Add(go);
             }
         }
 
         // Figure out which variation to use, if no variation use first candidate found
-        if (randomize)
-        {
+        if (randomize) {
             variation = UnityEngine.Random.Range(1, candidates.Count);
         }
-        if (variation != 0)
-        {
+        if (variation != 0) {
             variation -= 1;
         }
 
@@ -58,8 +51,7 @@ public void Launch(
         Vector3 direction,
         string objectName,
         bool randomize
-    )
-    {
+    ) {
         GameObject toLaunch = GetGameObject(objectName, randomize, 0);
         GameObject fireaway = Instantiate(
             toLaunch,
diff --git a/unity/Assets/Scripts/EditorSetupSimObjPhysics.cs b/unity/Assets/Scripts/EditorSetupSimObjPhysics.cs
index 2590888cb2..41124c7702 100644
--- a/unity/Assets/Scripts/EditorSetupSimObjPhysics.cs
+++ b/unity/Assets/Scripts/EditorSetupSimObjPhysics.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 // THIS IS WINSON EXPERIMENTING WITH SETUP FUNCTIONS< DO NOT USE RIGHT NOW
-public class EditorSetupSimObjPhysics : MonoBehaviour
-{
+public class EditorSetupSimObjPhysics : MonoBehaviour {
     public SimObjType Type;
     public SimObjPrimaryProperty Primary;
     public SimObjSecondaryProperty[] Secondary;
@@ -15,8 +14,7 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    public void Mirror()
-    {
+    public void Mirror() {
         // SimObjSecondaryProperty[] MirrorSecondary = new SimObjSecondaryProperty[]{SimObjSecondaryProperty.CanBeCleanedGlass};
         // Setup(SimObjType.Mirror, SimObjPrimaryProperty.Static, MirrorSecondary);
     }
@@ -27,8 +25,7 @@ public void Setup(
         SimObjSecondaryProperty[] secondaryProperties,
         string tag,
         int layer
-    )
-    {
+    ) {
         // SimObjPhysics sop = gameObject.GetComponent<SimObjPhysics>();
 
         // sop.Type = type;
diff --git a/unity/Assets/Scripts/ExpRoom/ArmAgentController_partial_ExpRoom.cs b/unity/Assets/Scripts/ExpRoom/ArmAgentController_partial_ExpRoom.cs
index 011cbb37bc..411498983b 100644
--- a/unity/Assets/Scripts/ExpRoom/ArmAgentController_partial_ExpRoom.cs
+++ b/unity/Assets/Scripts/ExpRoom/ArmAgentController_partial_ExpRoom.cs
@@ -13,14 +13,10 @@
 using UnityStandardAssets.ImageEffects;
 using UnityStandardAssets.Utility;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public partial class KinovaArmAgentController : ArmAgentController
-    {
-        public void AttachObjectToArmWithFixedJoint(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public partial class KinovaArmAgentController : ArmAgentController {
+        public void AttachObjectToArmWithFixedJoint(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -30,8 +26,7 @@ public void AttachObjectToArmWithFixedJoint(string objectId)
             actionFinished(getArmImplementation().AttachObjectToArmWithFixedJoint(target));
         }
 
-        public void BreakFixedJoints()
-        {
+        public void BreakFixedJoints() {
             actionFinished(getArmImplementation().BreakFixedJoints());
         }
     }
diff --git a/unity/Assets/Scripts/ExpRoom/IK_Robot_Arm_Controller_partial_ExpRoom.cs b/unity/Assets/Scripts/ExpRoom/IK_Robot_Arm_Controller_partial_ExpRoom.cs
index 2e83288286..8616af0013 100644
--- a/unity/Assets/Scripts/ExpRoom/IK_Robot_Arm_Controller_partial_ExpRoom.cs
+++ b/unity/Assets/Scripts/ExpRoom/IK_Robot_Arm_Controller_partial_ExpRoom.cs
@@ -13,14 +13,10 @@
 using UnityStandardAssets.ImageEffects;
 using UnityStandardAssets.Utility;
 
-public partial class IK_Robot_Arm_Controller : ArmController
-{
-    public bool AttachObjectToArmWithFixedJoint(SimObjPhysics target)
-    {
-        foreach (FixedJoint fj in magnetSphere.gameObject.GetComponents<FixedJoint>())
-        {
-            if (fj.connectedBody.gameObject == target.gameObject)
-            {
+public partial class IK_Robot_Arm_Controller : ArmController {
+    public bool AttachObjectToArmWithFixedJoint(SimObjPhysics target) {
+        foreach (FixedJoint fj in magnetSphere.gameObject.GetComponents<FixedJoint>()) {
+            if (fj.connectedBody.gameObject == target.gameObject) {
                 return true;
             }
         }
@@ -34,10 +30,8 @@ public bool AttachObjectToArmWithFixedJoint(SimObjPhysics target)
         return true;
     }
 
-    public bool BreakFixedJoints()
-    {
-        foreach (FixedJoint fj in magnetSphere.gameObject.GetComponents<FixedJoint>())
-        {
+    public bool BreakFixedJoints() {
+        foreach (FixedJoint fj in magnetSphere.gameObject.GetComponents<FixedJoint>()) {
             Destroy(fj);
         }
         return true;
diff --git a/unity/Assets/Scripts/ExpRoom/PhysicsRemoteFPSAgentController_partial_ExpRoom.cs b/unity/Assets/Scripts/ExpRoom/PhysicsRemoteFPSAgentController_partial_ExpRoom.cs
index 0cb8c1dda1..ef6f0130a5 100644
--- a/unity/Assets/Scripts/ExpRoom/PhysicsRemoteFPSAgentController_partial_ExpRoom.cs
+++ b/unity/Assets/Scripts/ExpRoom/PhysicsRemoteFPSAgentController_partial_ExpRoom.cs
@@ -13,22 +13,16 @@
 using UnityStandardAssets.ImageEffects;
 using UnityStandardAssets.Utility;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public partial class PhysicsRemoteFPSAgentController : BaseFPSAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public partial class PhysicsRemoteFPSAgentController : BaseFPSAgentController {
         protected Dictionary<string, SimObjPhysics> cachedAvailableExpRoomObjectsDict = null;
         protected Dictionary<string, SimObjPhysics> cachedAvailableExpRoomContainersDict = null;
 
-        public Dictionary<string, SimObjPhysics> availableExpRoomObjectsDict
-        {
-            get
-            {
-                if (cachedAvailableExpRoomObjectsDict == null)
-                {
+        public Dictionary<string, SimObjPhysics> availableExpRoomObjectsDict {
+            get {
+                if (cachedAvailableExpRoomObjectsDict == null) {
                     cachedAvailableExpRoomObjectsDict = new Dictionary<string, SimObjPhysics>();
-                    foreach (Transform t in GameObject.Find("AvailableObjects").transform)
-                    {
+                    foreach (Transform t in GameObject.Find("AvailableObjects").transform) {
                         SimObjPhysics sop = t.gameObject.GetComponent<SimObjPhysics>();
                         cachedAvailableExpRoomObjectsDict.Add(sop.name, sop);
                     }
@@ -37,15 +31,11 @@ public Dictionary<string, SimObjPhysics> availableExpRoomObjectsDict
             }
         }
 
-        public Dictionary<string, SimObjPhysics> availableExpRoomContainersDict
-        {
-            get
-            {
-                if (cachedAvailableExpRoomContainersDict == null)
-                {
+        public Dictionary<string, SimObjPhysics> availableExpRoomContainersDict {
+            get {
+                if (cachedAvailableExpRoomContainersDict == null) {
                     cachedAvailableExpRoomContainersDict = new Dictionary<string, SimObjPhysics>();
-                    foreach (Transform t in GameObject.Find("AvailableContainers").transform)
-                    {
+                    foreach (Transform t in GameObject.Find("AvailableContainers").transform) {
                         SimObjPhysics sop = t.gameObject.GetComponent<SimObjPhysics>();
                         cachedAvailableExpRoomContainersDict.Add(sop.name, sop);
                     }
@@ -54,19 +44,16 @@ public Dictionary<string, SimObjPhysics> availableExpRoomContainersDict
             }
         }
 
-        public static void emptyEnumerator(IEnumerator enumerator)
-        {
+        public static void emptyEnumerator(IEnumerator enumerator) {
             while (enumerator.MoveNext()) { }
         }
 
         public void WhichContainersDoesAvailableObjectFitIn(
             string objectName,
             int? thirdPartyCameraIndex = null
-        )
-        {
+        ) {
             Camera camera = m_Camera;
-            if (thirdPartyCameraIndex.HasValue)
-            {
+            if (thirdPartyCameraIndex.HasValue) {
                 camera = agentManager.thirdPartyCameras[thirdPartyCameraIndex.Value];
             }
             PhysicsSceneManager.StartPhysicsCoroutine(
@@ -81,17 +68,14 @@ public void WhichContainersDoesAvailableObjectFitIn(
         public IEnumerator<float?> whichContainersDoesAvailableObjectFitIn(
             string objectName,
             Camera visibilityCheckCamera
-        )
-        {
-            Action<SimObjPhysics> activateSop = (sop) =>
-            {
+        ) {
+            Action<SimObjPhysics> activateSop = (sop) => {
                 sop.gameObject.SetActive(true);
                 sop.ObjectID = sop.name;
                 physicsSceneManager.AddToObjectsInScene(sop);
             };
 
-            Action<SimObjPhysics> deactivateSop = (sop) =>
-            {
+            Action<SimObjPhysics> deactivateSop = (sop) => {
                 sop.gameObject.SetActive(false);
                 physicsSceneManager.RemoveFromObjectsInScene(sop);
             };
@@ -101,8 +85,7 @@ Camera visibilityCheckCamera
 
             Dictionary<string, float> coverNameToScale = new Dictionary<string, float>();
 
-            if (!availableExpRoomObjectsDict.ContainsKey(objectName))
-            {
+            if (!availableExpRoomObjectsDict.ContainsKey(objectName)) {
                 errorMessage = $"Could not find object with name {objectName}";
                 actionFinished(false);
                 yield break;
@@ -110,8 +93,7 @@ Camera visibilityCheckCamera
 
             SimObjPhysics toCover = availableExpRoomObjectsDict[objectName];
 
-            if (toCover.GetComponent<Break>())
-            {
+            if (toCover.GetComponent<Break>()) {
                 toCover.GetComponent<Break>().Unbreakable = true;
             }
 
@@ -124,8 +106,7 @@ Camera visibilityCheckCamera
                     rotation: null,
                     forceKinematic: true
                 )
-            )
-            {
+            ) {
                 deactivateSop(toCover);
                 errorMessage = $"{toCover.name} failed to place";
                 actionFinished(false);
@@ -141,10 +122,8 @@ Camera visibilityCheckCamera
                 SimObjPhysics cover in availableExpRoomContainersDict
                     .OrderBy(kvp => kvp.Key)
                     .Select(kvp => kvp.Value)
-            )
-            {
-                if (cover.GetComponent<Break>())
-                {
+            ) {
+                if (cover.GetComponent<Break>()) {
                     cover.GetComponent<Break>().Unbreakable = true;
                 }
 
@@ -161,8 +140,7 @@ SimObjPhysics cover in availableExpRoomContainersDict
                 float minScale = Mathf.Min(0.5f, maxScale / 2.0f);
 
                 float lastScale = 1.0f;
-                Func<float, bool> tryScale = (scale) =>
-                {
+                Func<float, bool> tryScale = (scale) => {
                     emptyEnumerator(
                         scaleObject(
                             scale: scale / lastScale,
@@ -183,8 +161,7 @@ SimObjPhysics cover in availableExpRoomContainersDict
                             forceKinematic: true,
                             includeErrorMessage: true
                         )
-                    )
-                    {
+                    ) {
 #if UNITY_EDITOR
                         Debug.Log($"{cover.name} failed to place: {errorMessage}");
 #endif
@@ -194,8 +171,7 @@ SimObjPhysics cover in availableExpRoomContainersDict
 
                     float coverY = cover.transform.position.y;
                     float toCoverHeight = toCover.BoundingBox.GetComponent<BoxCollider>().size.y;
-                    for (int i = 0; i < 4; i++)
-                    {
+                    for (int i = 0; i < 4; i++) {
                         cover.transform.position = new Vector3(
                             toCoverPos.x,
                             coverY + toCoverHeight * (i / 4f),
@@ -206,15 +182,12 @@ SimObjPhysics cover in availableExpRoomContainersDict
 
                         Collider coverCollidingWith =
                             UtilityFunctions.firstColliderObjectCollidingWith(go: cover.gameObject);
-                        if (coverCollidingWith != null)
-                        {
+                        if (coverCollidingWith != null) {
                             //Debug.Log($"{cover.name} colliding with {coverCollidingWith.transform.parent.name}");
                             return false;
                         }
-                        if (i == 0)
-                        {
-                            if (isSimObjVisible(visibilityCheckCamera, toCover, 10f).visible)
-                            {
+                        if (i == 0) {
+                            if (isSimObjVisible(visibilityCheckCamera, toCover, 10f).visible) {
                                 return false;
                             }
                         }
@@ -222,17 +195,12 @@ SimObjPhysics cover in availableExpRoomContainersDict
                     return true;
                 };
 
-                if (tryScale(maxScale))
-                {
-                    for (int i = 0; i <= 5; i++)
-                    {
+                if (tryScale(maxScale)) {
+                    for (int i = 0; i <= 5; i++) {
                         float newScale = (minScale + maxScale) / 2.0f;
-                        if (tryScale(newScale))
-                        {
+                        if (tryScale(newScale)) {
                             maxScale = newScale;
-                        }
-                        else
-                        {
+                        } else {
                             minScale = newScale;
                         }
                         yield return null;
@@ -261,8 +229,7 @@ SimObjPhysics cover in availableExpRoomContainersDict
                 Newtonsoft.Json.JsonConvert.SerializeObject(
                     coverNameToScale,
                     Newtonsoft.Json.Formatting.None,
-                    new Newtonsoft.Json.JsonSerializerSettings()
-                    {
+                    new Newtonsoft.Json.JsonSerializerSettings() {
                         ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                         ContractResolver = new ShouldSerializeContractResolver()
                     }
@@ -277,10 +244,8 @@ SimObjPhysics cover in availableExpRoomContainersDict
             actionFinished(true, coverNameToScale);
         }
 
-        public void SetCollisionDetectionModeToContinuousSpeculative(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void SetCollisionDetectionModeToContinuousSpeculative(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -288,77 +253,56 @@ public void SetCollisionDetectionModeToContinuousSpeculative(string objectId)
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             Rigidbody rb = target.GetComponent<Rigidbody>();
-            if (!rb)
-            {
+            if (!rb) {
                 errorMessage = $"Could not find rigid body for {objectId}";
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
                 actionFinished(true, availableExpRoomContainersDict.Keys.ToList());
             }
         }
 
-        public void AvailableExpRoomObjects()
-        {
+        public void AvailableExpRoomObjects() {
             actionFinished(true, availableExpRoomObjectsDict.Keys.ToList());
         }
 
-        public void AvailableExpRoomContainers()
-        {
+        public void AvailableExpRoomContainers() {
             actionFinished(true, availableExpRoomContainersDict.Keys.ToList());
         }
 
-        public void ToggleExpRoomObject(string objectName, bool? enable = null)
-        {
+        public void ToggleExpRoomObject(string objectName, bool? enable = null) {
             SimObjPhysics target = null;
-            if (availableExpRoomObjectsDict.ContainsKey(objectName))
-            {
+            if (availableExpRoomObjectsDict.ContainsKey(objectName)) {
                 target = availableExpRoomObjectsDict[objectName];
-            }
-            else if (availableExpRoomContainersDict.ContainsKey(objectName))
-            {
+            } else if (availableExpRoomContainersDict.ContainsKey(objectName)) {
                 target = availableExpRoomContainersDict[objectName];
-            }
-            else
-            {
+            } else {
                 errorMessage = $"Could not find object with name {objectName}";
                 actionFinishedEmit(false);
                 return;
             }
 
-            if (!enable.HasValue)
-            {
+            if (!enable.HasValue) {
                 enable = !target.gameObject.activeSelf;
             }
 
             target.gameObject.SetActive(enable.Value);
-            if (enable.Value)
-            {
-                foreach (Renderer r in target.GetComponentsInChildren<Renderer>())
-                {
-                    if (!r.enabled)
-                    {
+            if (enable.Value) {
+                foreach (Renderer r in target.GetComponentsInChildren<Renderer>()) {
+                    if (!r.enabled) {
                         initiallyDisabledRenderers.Add(r.GetInstanceID());
                     }
                 }
                 target.ObjectID = target.name;
                 physicsSceneManager.AddToObjectsInScene(target);
                 actionFinished(true, target.ObjectID);
-            }
-            else
-            {
-                foreach (Renderer r in target.GetComponentsInChildren<Renderer>())
-                {
-                    if (initiallyDisabledRenderers.Contains(r.GetInstanceID()))
-                    {
+            } else {
+                foreach (Renderer r in target.GetComponentsInChildren<Renderer>()) {
+                    if (initiallyDisabledRenderers.Contains(r.GetInstanceID())) {
                         initiallyDisabledRenderers.Remove(r.GetInstanceID());
                         r.enabled = false;
-                    }
-                    else
-                    {
+                    } else {
                         r.enabled = true;
                     }
                 }
@@ -367,10 +311,8 @@ public void ToggleExpRoomObject(string objectName, bool? enable = null)
             }
         }
 
-        public void ToggleObjectIsKinematic(string objectId, bool? isKinematic = null)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void ToggleObjectIsKinematic(string objectId, bool? isKinematic = null) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -379,12 +321,9 @@ public void ToggleObjectIsKinematic(string objectId, bool? isKinematic = null)
             Rigidbody rb = physicsSceneManager
                 .ObjectIdToSimObjPhysics[objectId]
                 .GetComponent<Rigidbody>();
-            if (isKinematic.HasValue)
-            {
+            if (isKinematic.HasValue) {
                 rb.isKinematic = isKinematic.Value;
-            }
-            else
-            {
+            } else {
                 rb.isKinematic = !rb.isKinematic;
             }
             actionFinishedEmit(true);
@@ -398,10 +337,8 @@ public void SetRigidbodyConstraints(
             bool freezeXRotation = false,
             bool freezeYRotation = false,
             bool freezeZRotation = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -411,47 +348,38 @@ public void SetRigidbodyConstraints(
             Rigidbody rb = target.GetComponent<Rigidbody>();
             rb.constraints = RigidbodyConstraints.None;
 
-            if (freezeX)
-            {
+            if (freezeX) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezePositionX;
             }
-            if (freezeY)
-            {
+            if (freezeY) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezePositionY;
             }
-            if (freezeZ)
-            {
+            if (freezeZ) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezePositionZ;
             }
 
-            if (freezeXRotation)
-            {
+            if (freezeXRotation) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezeRotationX;
             }
-            if (freezeYRotation)
-            {
+            if (freezeYRotation) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezeRotationY;
             }
-            if (freezeZRotation)
-            {
+            if (freezeZRotation) {
                 rb.constraints = rb.constraints | RigidbodyConstraints.FreezeRotationZ;
             }
 
             actionFinished(true);
         }
 
-        public List<Vector3> pointOnObjectsCollidersClosestToPoint(string objectId, Vector3 point)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public List<Vector3> pointOnObjectsCollidersClosestToPoint(string objectId, Vector3 point) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 return null;
             }
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             List<Vector3> closePoints = new List<Vector3>();
-            foreach (Collider c in target.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in target.GetComponentsInChildren<Collider>()) {
                 // The below subtype checks are required as `ClosestPoint` only works
                 // on certain collider types. We fall back to using the object's bounding box (see below)
                 // if there are no colliders of the supported types.
@@ -464,8 +392,7 @@ c is BoxCollider
                         || c is CapsuleCollider
                         || (c is MeshCollider && ((MeshCollider)c).convex)
                     )
-                )
-                {
+                ) {
                     closePoints.Add(c.ClosestPoint(point));
 #if UNITY_EDITOR
                     Vector3 closePoint = closePoints[closePoints.Count - 1];
@@ -475,8 +402,7 @@ c is BoxCollider
 #endif
                 }
             }
-            if (closePoints.Count == 0)
-            {
+            if (closePoints.Count == 0) {
                 target.syncBoundingBoxes(forceCreateObjectOrientedBoundingBox: true);
                 BoxCollider bbox = target.BoundingBox.GetComponent<BoxCollider>();
                 bbox.enabled = true;
@@ -516,8 +442,7 @@ c is BoxCollider
         ///
         /// In the Unity Editor, this method also logs the distance from the closest points to the specified point, aiding in debugging and visualization.
         /// </remarks>
-        public void PointOnObjectsCollidersClosestToPoint(string objectId, Vector3 point)
-        {
+        public void PointOnObjectsCollidersClosestToPoint(string objectId, Vector3 point) {
             List<Vector3> closePoints = pointOnObjectsCollidersClosestToPoint(
                 objectId: objectId,
                 point: point
@@ -525,10 +450,8 @@ public void PointOnObjectsCollidersClosestToPoint(string objectId, Vector3 point
             actionFinishedEmit(closePoints != null, closePoints);
         }
 
-        public void PointOnObjectsMeshClosestToPoint(string objectId, Vector3 point)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void PointOnObjectsMeshClosestToPoint(string objectId, Vector3 point) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -536,28 +459,23 @@ public void PointOnObjectsMeshClosestToPoint(string objectId, Vector3 point)
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             List<Vector3> points = new List<Vector3>();
-            foreach (MeshFilter mf in target.GetComponentsInChildren<MeshFilter>())
-            {
-                foreach (Vector3 v in mf.mesh.vertices)
-                {
+            foreach (MeshFilter mf in target.GetComponentsInChildren<MeshFilter>()) {
+                foreach (Vector3 v in mf.mesh.vertices) {
                     points.Add(mf.transform.TransformPoint(v));
                 }
             }
             points = points.OrderBy(x => Vector3.Distance(point, x)).ToList();
 
 #if UNITY_EDITOR
-            foreach (Vector3 p in points)
-            {
+            foreach (Vector3 p in points) {
                 Debug.Log($"{p} has dist {Vector3.Distance(p, point)}");
             }
 #endif
             actionFinishedEmit(true, points);
         }
 
-        public void ProportionOfObjectVisible(string objectId, int? thirdPartyCameraIndex = null)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void ProportionOfObjectVisible(string objectId, int? thirdPartyCameraIndex = null) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -566,20 +484,17 @@ public void ProportionOfObjectVisible(string objectId, int? thirdPartyCameraInde
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             float propVisible = 0f;
-            if (target.VisibilityPoints != null && target.VisibilityPoints.Length > 0)
-            {
+            if (target.VisibilityPoints != null && target.VisibilityPoints.Length > 0) {
                 Transform[] visPoints = target.VisibilityPoints;
                 int visPointCount = 0;
 
                 Camera camera = thirdPartyCameraIndex.HasValue
                     ? agentManager.thirdPartyCameras[thirdPartyCameraIndex.Value]
                     : m_Camera;
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     // if this particular point is in view...
 
-                    if (CheckIfVisibilityPointInViewport(target, point, camera, false).visible)
-                    {
+                    if (CheckIfVisibilityPointInViewport(target, point, camera, false).visible) {
                         visPointCount++;
                     }
                 }
@@ -590,11 +505,9 @@ public void ProportionOfObjectVisible(string objectId, int? thirdPartyCameraInde
             actionFinishedEmit(true, propVisible);
         }
 
-        protected GameObject addClippingPlaneToObject(SimObjPhysics target)
-        {
+        protected GameObject addClippingPlaneToObject(SimObjPhysics target) {
             Ronja.ClippingPlane clipPlane = target.GetComponentInChildren<Ronja.ClippingPlane>();
-            if (clipPlane != null)
-            {
+            if (clipPlane != null) {
                 return clipPlane.gameObject;
             }
 
@@ -606,22 +519,17 @@ protected GameObject addClippingPlaneToObject(SimObjPhysics target)
             clipPlane = clipPlaneGo.AddComponent<Ronja.ClippingPlane>();
 
             List<Material> materials = new List<Material>();
-            foreach (MeshRenderer mr in target.GetComponentsInChildren<MeshRenderer>())
-            {
+            foreach (MeshRenderer mr in target.GetComponentsInChildren<MeshRenderer>()) {
                 List<Material> newMRMaterials = new List<Material>();
                 bool anyOpaque = false;
-                foreach (Material mat in mr.materials)
-                {
-                    if (mat.GetTag("RenderType", false) == "Opaque")
-                    {
+                foreach (Material mat in mr.materials) {
+                    if (mat.GetTag("RenderType", false) == "Opaque") {
                         anyOpaque = true;
                         break;
                     }
                 }
-                foreach (Material mat in mr.materials)
-                {
-                    if (!anyOpaque || mat.GetTag("RenderType", false) == "Opaque")
-                    {
+                foreach (Material mat in mr.materials) {
+                    if (!anyOpaque || mat.GetTag("RenderType", false) == "Opaque") {
                         newMRMaterials.Add(mat);
                         Vector4 col = mat.GetVector("_Color");
                         Vector4 emission = mat.GetVector("_EmissionColor");
@@ -645,10 +553,8 @@ public void AddClippingPlaneToObject(
             Vector3? position = null,
             Vector3? normal = null,
             bool? enabled = null
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -658,19 +564,16 @@ public void AddClippingPlaneToObject(
 
             GameObject planeGo = addClippingPlaneToObject(target);
 
-            if (position.HasValue)
-            {
+            if (position.HasValue) {
                 planeGo.transform.position = position.Value;
             }
 
-            if (normal.HasValue)
-            {
+            if (normal.HasValue) {
                 planeGo.transform.up = Vector3.Normalize(normal.Value);
             }
 
             Ronja.ClippingPlane clipPlane = planeGo.GetComponent<Ronja.ClippingPlane>();
-            if (enabled.HasValue)
-            {
+            if (enabled.HasValue) {
                 clipPlane.shouldClip = enabled.Value;
             }
 
@@ -681,10 +584,8 @@ public void AddClippingPlaneToObject(
             actionFinished(true, toReturn);
         }
 
-        public void AddClippingPlaneToObjectToExcludeBox(string objectId, List<Vector3> boxCorners)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void AddClippingPlaneToObjectToExcludeBox(string objectId, List<Vector3> boxCorners) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -705,24 +606,19 @@ public void AddClippingPlaneToObjectToExcludeBox(string objectId, List<Vector3>
             toReturn["enabled"] = planeGo.GetComponentInChildren<Ronja.ClippingPlane>().shouldClip;
             toReturn["position"] = planeGo.transform.position;
             toReturn["normal"] = planeGo.transform.up;
-            if (!(bool)toReturn["enabled"])
-            {
+            if (!(bool)toReturn["enabled"]) {
                 errorMessage = (
                     "Clipping plane was placed on object but is disabled as the"
                     + " input bounding box contained no points on the object's mesh."
                 );
                 actionFinished(false, toReturn);
-            }
-            else
-            {
+            } else {
                 actionFinished(true, toReturn);
             }
         }
 
-        public void GetClippingPlane(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void GetClippingPlane(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -730,8 +626,7 @@ public void GetClippingPlane(string objectId)
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             Ronja.ClippingPlane clipPlane = target.GetComponentInChildren<Ronja.ClippingPlane>();
-            if (clipPlane == null)
-            {
+            if (clipPlane == null) {
                 errorMessage =
                     $"Object with id {objectId} does not have a clipping plane associated with it.";
                 actionFinishedEmit(false);
@@ -746,10 +641,8 @@ public void GetClippingPlane(string objectId)
             actionFinishedEmit(true, toReturn);
         }
 
-        public void ToggleClippingPlane(string objectId, bool? enabled = null)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void ToggleClippingPlane(string objectId, bool? enabled = null) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -757,22 +650,19 @@ public void ToggleClippingPlane(string objectId, bool? enabled = null)
             SimObjPhysics target = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
 
             Ronja.ClippingPlane clipPlane = target.GetComponentInChildren<Ronja.ClippingPlane>();
-            if (clipPlane == null)
-            {
+            if (clipPlane == null) {
                 errorMessage =
                     $"Object with id {objectId} does not have a clipping plane associated with it.";
                 actionFinished(false);
                 return;
             }
 
-            if (!enabled.HasValue)
-            {
+            if (!enabled.HasValue) {
                 enabled = !clipPlane.shouldClip;
             }
 
             bool changed = false;
-            if (enabled.Value != clipPlane.shouldClip)
-            {
+            if (enabled.Value != clipPlane.shouldClip) {
                 changed = true;
                 clipPlane.shouldClip = enabled.Value;
             }
@@ -782,29 +672,22 @@ public void ToggleClippingPlane(string objectId, bool? enabled = null)
             toReturn["enabled"] = enabled.Value;
             toReturn["position"] = planeGo.transform.position;
             toReturn["normal"] = planeGo.transform.up;
-            if (changed)
-            {
+            if (changed) {
                 actionFinished(true, toReturn);
-            }
-            else
-            {
+            } else {
                 actionFinishedEmit(true, toReturn);
             }
         }
 
-        protected List<Vector3> cornersOfBounds(Bounds b)
-        {
+        protected List<Vector3> cornersOfBounds(Bounds b) {
             List<Vector3> corners = new List<Vector3>();
-            for (int i = 0; i < 2; i++)
-            {
+            for (int i = 0; i < 2; i++) {
                 float x = i == 0 ? b.min.x : b.max.x;
 
-                for (int j = 0; j < 2; j++)
-                {
+                for (int j = 0; j < 2; j++) {
                     float y = j == 0 ? b.min.y : b.max.y;
 
-                    for (int k = 0; k < 2; k++)
-                    {
+                    for (int k = 0; k < 2; k++) {
                         float z = k == 0 ? b.min.z : b.max.z;
 
                         corners.Add(new Vector3(x, y, z));
@@ -817,11 +700,9 @@ protected List<Vector3> cornersOfBounds(Bounds b)
         public GameObject addClippingPlaneToObjectToExcludeBox(
             SimObjPhysics target,
             float[][] boxCorners
-        )
-        {
+        ) {
             List<Vector3> boxCornersV3 = new List<Vector3>();
-            for (int i = 0; i < boxCorners.Length; i++)
-            {
+            for (int i = 0; i < boxCorners.Length; i++) {
                 boxCornersV3.Add(new Vector3(boxCorners[i][0], boxCorners[i][1], boxCorners[i][2]));
             }
             return addClippingPlaneToObjectToExcludeBox(target, boxCornersV3);
@@ -830,40 +711,32 @@ float[][] boxCorners
         public GameObject addClippingPlaneToObjectToExcludeBox(
             SimObjPhysics target,
             List<Vector3> boxCorners
-        )
-        {
+        ) {
             GameObject clipPlaneGo = addClippingPlaneToObject(target);
 
             Bounds boundsOfInputBox = UtilityFunctions.CreateEmptyBounds();
-            foreach (Vector3 bc in boxCorners)
-            {
+            foreach (Vector3 bc in boxCorners) {
                 boundsOfInputBox.Encapsulate(bc);
             }
 
             Bounds boundsOfVerticesToExclude = UtilityFunctions.CreateEmptyBounds();
             bool anythingEncapsulated = false;
-            foreach (MeshFilter mf in target.GetComponentsInChildren<MeshFilter>())
-            {
+            foreach (MeshFilter mf in target.GetComponentsInChildren<MeshFilter>()) {
                 Mesh m = mf.mesh;
 
-                for (int i = 0; i < m.vertices.Length; i++)
-                {
+                for (int i = 0; i < m.vertices.Length; i++) {
                     Vector3 v = mf.transform.TransformPoint(m.vertices[i]);
-                    if (boundsOfInputBox.Contains(v))
-                    {
+                    if (boundsOfInputBox.Contains(v)) {
                         anythingEncapsulated = true;
                         boundsOfVerticesToExclude.Encapsulate(v);
                     }
                 }
             }
 
-            if (!anythingEncapsulated)
-            {
+            if (!anythingEncapsulated) {
                 clipPlaneGo.GetComponent<Ronja.ClippingPlane>().shouldClip = false;
                 return clipPlaneGo;
-            }
-            else
-            {
+            } else {
                 clipPlaneGo.GetComponent<Ronja.ClippingPlane>().shouldClip = true;
             }
 
@@ -872,37 +745,28 @@ List<Vector3> boxCorners
             Vector3 direction = boundsOfVerticesToExclude.center - target.transform.position;
             this.autoSyncTransforms();
 
-            if (Math.Abs(direction.x) > Math.Abs(direction.z))
-            {
+            if (Math.Abs(direction.x) > Math.Abs(direction.z)) {
                 Vector3 lookOffset = new Vector3(Mathf.Sign(direction.x), 0f, 0f);
                 clipPlaneGo.transform.LookAt(lookOffset + startPos);
                 clipPlaneGo.transform.Rotate(new Vector3(90f, 0f, 0f));
-                if (lookOffset.x > 0f)
-                {
+                if (lookOffset.x > 0f) {
                     clipPlaneGo.transform.position =
                         new Vector3(boundsOfVerticesToExclude.min.x - startPos.x, 0f, 0f)
                         + startPos;
-                }
-                else
-                {
+                } else {
                     clipPlaneGo.transform.position =
                         new Vector3(boundsOfVerticesToExclude.max.x - startPos.x, 0f, 0f)
                         + startPos;
                 }
-            }
-            else
-            {
+            } else {
                 Vector3 lookOffset = new Vector3(0f, 0f, Mathf.Sign(direction.z));
                 clipPlaneGo.transform.LookAt(lookOffset + startPos);
                 clipPlaneGo.transform.Rotate(new Vector3(90f, 0f, 0f));
-                if (lookOffset.z > 0f)
-                {
+                if (lookOffset.z > 0f) {
                     clipPlaneGo.transform.position =
                         new Vector3(0f, 0f, boundsOfVerticesToExclude.min.z - startPos.z)
                         + startPos;
-                }
-                else
-                {
+                } else {
                     clipPlaneGo.transform.position =
                         new Vector3(0f, 0f, boundsOfVerticesToExclude.max.z - startPos.z)
                         + startPos;
@@ -916,8 +780,7 @@ List<Vector3> boxCorners
         // creates a grid starting from the agent's current hand position and projects that grid
         // forward relative to the agent
         // grid will be a 2n+1 by n grid in the orientation of agent right/left by agent forward
-        public void GetReceptacleCoordinatesExpRoom(float gridSize, int maxStepCount)
-        {
+        public void GetReceptacleCoordinatesExpRoom(float gridSize, int maxStepCount) {
             var agent = this.agentManager.agents[0];
             ExperimentRoomSceneManager ersm =
                 physicsSceneManager.GetComponent<ExperimentRoomSceneManager>();
@@ -940,18 +803,15 @@ public void SpawnExperimentObjAtPoint(
             Vector3 position,
             float rotation,
             int objectVariation = 0
-        )
-        {
-            if (receptacleObjectId == null)
-            {
+        ) {
+            if (receptacleObjectId == null) {
                 errorMessage =
                     "please give valid receptacleObjectId for SpawnExperimentReceptacleAtPoint action";
                 actionFinished(false);
                 return;
             }
 
-            if (objectType == null)
-            {
+            if (objectType == null) {
                 errorMessage =
                     "please use either 'receptacle' or 'screen' to specify which experiment object to spawn";
                 actionFinished(false);
@@ -960,16 +820,13 @@ public void SpawnExperimentObjAtPoint(
 
             SimObjPhysics target = null;
             // find the object in the scene, disregard visibility
-            foreach (SimObjPhysics sop in VisibleSimObjs(true))
-            {
-                if (sop.objectID == receptacleObjectId)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                if (sop.objectID == receptacleObjectId) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage =
                     "no receptacle object with id: "
                     + receptacleObjectId
@@ -989,12 +846,9 @@ public void SpawnExperimentObjAtPoint(
                     position,
                     rotation
                 )
-            )
-            {
+            ) {
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = $"Experiment object could not be placed on {receptacleObjectId}";
                 actionFinished(false);
             }
@@ -1008,18 +862,15 @@ public void SpawnExperimentObjAtRandom(
             float rotation,
             int randomSeed,
             int objectVariation = 0
-        )
-        {
-            if (receptacleObjectId == null)
-            {
+        ) {
+            if (receptacleObjectId == null) {
                 errorMessage =
                     "please give valid receptacleObjectId for SpawnExperimentReceptacleAtRandom action";
                 actionFinished(false);
                 return;
             }
 
-            if (objectType == null)
-            {
+            if (objectType == null) {
                 errorMessage =
                     "please use either 'receptacle' or 'screen' to specify which experiment object to spawn";
                 actionFinished(false);
@@ -1028,16 +879,13 @@ public void SpawnExperimentObjAtRandom(
 
             SimObjPhysics target = null;
             // find the object in the scene, disregard visibility
-            foreach (SimObjPhysics sop in VisibleSimObjs(true))
-            {
-                if (sop.objectID == receptacleObjectId)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                if (sop.objectID == receptacleObjectId) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage =
                     "no receptacle object with id: "
                     + receptacleObjectId
@@ -1057,30 +905,24 @@ public void SpawnExperimentObjAtRandom(
                     target,
                     rotation
                 )
-            )
-            {
+            ) {
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Experiment object could not be placed on " + receptacleObjectId;
                 actionFinished(false);
             }
         }
 
         // specify a screen by objectId in exp room and change material to objectVariation
-        public void ChangeScreenMaterialExpRoom(string objectId, int objectVariation)
-        {
+        public void ChangeScreenMaterialExpRoom(string objectId, int objectVariation) {
             // only 5 material options at the moment
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "please use objectVariation [0, 4] inclusive";
                 actionFinished(false);
                 return;
             }
 
-            if (objectId == null)
-            {
+            if (objectId == null) {
                 errorMessage = "please give valid objectId for ChangeScreenMaterialExpRoom action";
                 actionFinished(false);
                 return;
@@ -1088,16 +930,13 @@ public void ChangeScreenMaterialExpRoom(string objectId, int objectVariation)
 
             SimObjPhysics target = null;
             // find the object in the scene, disregard visibility
-            foreach (SimObjPhysics sop in VisibleSimObjs(true))
-            {
-                if (sop.objectID == objectId)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                if (sop.objectID == objectId) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage =
                     "no object with id: "
                     + objectId
@@ -1113,10 +952,8 @@ public void ChangeScreenMaterialExpRoom(string objectId, int objectVariation)
         }
 
         // specify a screen in exp room by objectId and change material color to rgb
-        public void ChangeScreenColorExpRoom(string objectId, float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeScreenColorExpRoom(string objectId, float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1124,16 +961,13 @@ public void ChangeScreenColorExpRoom(string objectId, float r, float g, float b)
 
             SimObjPhysics target = null;
             // find the object in the scene, disregard visibility
-            foreach (SimObjPhysics sop in VisibleSimObjs(true))
-            {
-                if (sop.objectID == objectId)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                if (sop.objectID == objectId) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage =
                     "no object with id: "
                     + objectId
@@ -1149,11 +983,9 @@ public void ChangeScreenColorExpRoom(string objectId, float r, float g, float b)
         }
 
         // change wall to material [variation]
-        public void ChangeWallMaterialExpRoom(int objectVariation)
-        {
+        public void ChangeWallMaterialExpRoom(int objectVariation) {
             // only 5 material options at the moment
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "please use objectVariation [0, 4] inclusive";
                 actionFinished(false);
                 return;
@@ -1166,10 +998,8 @@ public void ChangeWallMaterialExpRoom(int objectVariation)
         }
 
         // change wall color to rgb (0-255, 0-255, 0-255)
-        public void ChangeWallColorExpRoom(float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeWallColorExpRoom(float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1182,11 +1012,9 @@ public void ChangeWallColorExpRoom(float r, float g, float b)
         }
 
         // change floor to material [variation]
-        public void ChangeFloorMaterialExpRoom(int objectVariation)
-        {
+        public void ChangeFloorMaterialExpRoom(int objectVariation) {
             // only 5 material options at the moment
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "please use objectVariation [0, 4] inclusive";
                 actionFinished(false);
                 return;
@@ -1199,10 +1027,8 @@ public void ChangeFloorMaterialExpRoom(int objectVariation)
         }
 
         // change wall color to rgb (0-255, 0-255, 0-255)
-        public void ChangeFloorColorExpRoom(float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeFloorColorExpRoom(float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1215,10 +1041,8 @@ public void ChangeFloorColorExpRoom(float r, float g, float b)
         }
 
         // change color of ceiling lights in exp room to rgb (0-255, 0-255, 0-255)
-        public void ChangeLightColorExpRoom(float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeLightColorExpRoom(float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1232,11 +1056,9 @@ public void ChangeLightColorExpRoom(float r, float g, float b)
 
         // change intensity of lights in exp room [0-5] these arent in like... lumens or anything
         // just a relative intensity value
-        public void ChangeLightIntensityExpRoom(float intensity)
-        {
+        public void ChangeLightIntensityExpRoom(float intensity) {
             // restrict this to [0-5]
-            if (intensity < 0 || intensity > 5)
-            {
+            if (intensity < 0 || intensity > 5) {
                 errorMessage = "light intensity must be [0.0 , 5.0] inclusive";
                 actionFinished(false);
                 return;
@@ -1248,11 +1070,9 @@ public void ChangeLightIntensityExpRoom(float intensity)
             actionFinished(true);
         }
 
-        public void ChangeTableTopMaterialExpRoom(int objectVariation)
-        {
+        public void ChangeTableTopMaterialExpRoom(int objectVariation) {
             // only 5 material options at the moment
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "please use objectVariation [0, 4] inclusive";
                 actionFinished(false);
                 return;
@@ -1264,10 +1084,8 @@ public void ChangeTableTopMaterialExpRoom(int objectVariation)
             actionFinished(true);
         }
 
-        public void ChangeTableTopColorExpRoom(float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeTableTopColorExpRoom(float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1279,11 +1097,9 @@ public void ChangeTableTopColorExpRoom(float r, float g, float b)
             actionFinished(true);
         }
 
-        public void ChangeTableLegMaterialExpRoom(int objectVariation)
-        {
+        public void ChangeTableLegMaterialExpRoom(int objectVariation) {
             // only 5 material options at the moment
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "please use objectVariation [0, 4] inclusive";
                 actionFinished(false);
                 return;
@@ -1295,10 +1111,8 @@ public void ChangeTableLegMaterialExpRoom(int objectVariation)
             actionFinished(true);
         }
 
-        public void ChangeTableLegColorExpRoom(float r, float g, float b)
-        {
-            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255)
-            {
+        public void ChangeTableLegColorExpRoom(float r, float g, float b) {
+            if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
                 errorMessage = "rgb values must be [0-255]";
                 actionFinished(false);
                 return;
@@ -1318,26 +1132,22 @@ public void ReturnValidSpawnsExpRoom(
             string receptacleObjectId,
             float rotation,
             int objectVariation = 0
-        )
-        {
-            if (receptacleObjectId == null)
-            {
+        ) {
+            if (receptacleObjectId == null) {
                 errorMessage =
                     "please give valid receptacleObjectId for ReturnValidSpawnsExpRoom action";
                 actionFinished(false);
                 return;
             }
 
-            if (objectType == null)
-            {
+            if (objectType == null) {
                 errorMessage =
                     "please use either 'receptacle' or 'screen' to specify which experiment object to spawn";
                 actionFinished(false);
                 return;
             }
 
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(receptacleObjectId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(receptacleObjectId)) {
                 errorMessage = $"Cannot find object with id {receptacleObjectId}.";
                 actionFinished(false);
                 return;
diff --git a/unity/Assets/Scripts/ExperimentRoomSceneManager.cs b/unity/Assets/Scripts/ExperimentRoomSceneManager.cs
index 0fcbc268b8..677c4aa389 100644
--- a/unity/Assets/Scripts/ExperimentRoomSceneManager.cs
+++ b/unity/Assets/Scripts/ExperimentRoomSceneManager.cs
@@ -4,8 +4,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class ExperimentRoomSceneManager : MonoBehaviour
-{
+public class ExperimentRoomSceneManager : MonoBehaviour {
     public GameObject[] replacementObjectsToSpawn = null;
 
     // set of experiment receptacle objects
@@ -50,8 +49,7 @@ public class ExperimentRoomSceneManager : MonoBehaviour
     Vector3 initialSpawnPosition = new Vector3(0, 100, 0);
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
         agentManager = gameObject.GetComponent<AgentManager>();
         sceneManager = gameObject.GetComponent<PhysicsSceneManager>();
     }
@@ -74,21 +72,18 @@ public List<Vector3> ValidGrid(
         float gridIncrement,
         int count,
         BaseFPSAgentController agent
-    )
-    {
+    ) {
         // start from origin which will be agent's hand
         List<Vector3> pointsOnGrid = new List<Vector3>();
 
-        for (int i = 0; i < count; i++)
-        {
+        for (int i = 0; i < count; i++) {
             // from origin, go gridIncrement a number of times equal to gridDimension
             // in the agent's forward direction
             Vector3 thisPoint = origin + agent.transform.forward * gridIncrement * i;
             pointsOnGrid.Add(thisPoint);
 
             // then, from this point, go gridDimension times in both left and right direction
-            for (int j = 1; j < count + 1; j++)
-            {
+            for (int j = 1; j < count + 1; j++) {
                 pointsOnGrid.Add(thisPoint + agent.transform.right * gridIncrement * j);
                 pointsOnGrid.Add(thisPoint + -agent.transform.right * gridIncrement * j);
             }
@@ -101,8 +96,7 @@ BaseFPSAgentController agent
         List<Vector3> actualPoints = new List<Vector3>();
         RaycastHit[] hits;
 
-        foreach (Vector3 point in pointsOnGrid)
-        {
+        foreach (Vector3 point in pointsOnGrid) {
             hits = Physics.RaycastAll(
                 point + new Vector3(0, 5, 0),
                 Vector3.down,
@@ -112,20 +106,16 @@ BaseFPSAgentController agent
             );
             float[] hitDistances = new float[hits.Length];
 
-            for (int i = 0; i < hitDistances.Length; i++)
-            {
+            for (int i = 0; i < hitDistances.Length; i++) {
                 hitDistances[i] = hits[i].distance;
             }
 
             Array.Sort(hitDistances, hits);
 
-            foreach (RaycastHit h in hits)
-            {
-                if (h.transform.GetComponent<SimObjPhysics>())
-                {
+            foreach (RaycastHit h in hits) {
+                if (h.transform.GetComponent<SimObjPhysics>()) {
                     var o = h.transform.GetComponent<SimObjPhysics>();
-                    if (o.Type != SimObjType.DiningTable && o.Type != SimObjType.Floor)
-                    {
+                    if (o.Type != SimObjType.DiningTable && o.Type != SimObjType.Floor) {
                         actualPoints.Add(point);
                     }
                 }
@@ -141,107 +131,89 @@ BaseFPSAgentController agent
     }
 
     // change specified screen object's material to color rgb
-    public void ChangeScreenColor(SimObjPhysics screen, float r, float g, float b)
-    {
+    public void ChangeScreenColor(SimObjPhysics screen, float r, float g, float b) {
         List<MeshRenderer> renderers = GetAllRenderersOfObject(screen);
-        foreach (MeshRenderer sr in renderers)
-        {
+        foreach (MeshRenderer sr in renderers) {
             // set first element, the primary mat, of the mat array's color
             sr.material.color = new Color(r / 255f, g / 255f, b / 255f);
         }
     }
 
     // change specified screen object's material to variation
-    public void ChangeScreenMaterial(SimObjPhysics screen, int variation)
-    {
+    public void ChangeScreenMaterial(SimObjPhysics screen, int variation) {
         List<MeshRenderer> renderers = GetAllRenderersOfObject(screen);
-        foreach (MeshRenderer sr in renderers)
-        {
+        foreach (MeshRenderer sr in renderers) {
             sr.material = screenMaterials[variation];
         }
     }
 
-    public List<MeshRenderer> GetAllRenderersOfObject(SimObjPhysics obj)
-    {
+    public List<MeshRenderer> GetAllRenderersOfObject(SimObjPhysics obj) {
         List<MeshRenderer> renderers = new List<MeshRenderer>();
         renderers.AddRange(obj.transform.gameObject.GetComponentsInChildren<MeshRenderer>());
         return renderers;
     }
 
-    public void ChangeLightColor(float r, float g, float b)
-    {
-        foreach (GameObject light in allOfTheLights)
-        {
+    public void ChangeLightColor(float r, float g, float b) {
+        foreach (GameObject light in allOfTheLights) {
             light.GetComponent<Light>().color = new Color(r / 255f, g / 255f, b / 255f);
         }
     }
 
     // 0 to like 5 is reasonable
-    public void ChangeLightIntensity(float intensity)
-    {
-        foreach (GameObject light in allOfTheLights)
-        {
+    public void ChangeLightIntensity(float intensity) {
+        foreach (GameObject light in allOfTheLights) {
             light.GetComponent<Light>().intensity = intensity;
         }
     }
 
-    public void ChangeTableTopMaterial(int variation = 0)
-    {
+    public void ChangeTableTopMaterial(int variation = 0) {
         Material[] mats = table.materials;
         mats[0] = tableTopMaterials[variation];
         table.materials = mats;
     }
 
-    public void ChangeTableTopColor(float r, float g, float b)
-    {
+    public void ChangeTableTopColor(float r, float g, float b) {
         Material[] mats = table.materials;
         mats[0].color = new Color(r / 255f, g / 255f, b / 255f);
         table.materials = mats;
     }
 
-    public void ChangeTableLegMaterial(int variation = 0)
-    {
+    public void ChangeTableLegMaterial(int variation = 0) {
         Material[] mats = table.materials;
         mats[1] = tableTopMaterials[variation];
         table.materials = mats;
     }
 
-    public void ChangeTableLegColor(float r, float g, float b)
-    {
+    public void ChangeTableLegColor(float r, float g, float b) {
         Material[] mats = table.materials;
         mats[1].color = new Color(r / 255f, g / 255f, b / 255f);
         table.materials = mats;
     }
 
-    public void ChangeLightConfig(int variation = 0)
-    {
+    public void ChangeLightConfig(int variation = 0) {
         // disable all lights
         // enable the specific variation
     }
 
     // change wall material variation
-    public void ChangeWallMaterial(int variation = 0)
-    {
+    public void ChangeWallMaterial(int variation = 0) {
         wall.material = wallMaterials[variation];
     }
 
     // change wall color r g b
-    public void ChangeWallColor(float r, float g, float b)
-    {
+    public void ChangeWallColor(float r, float g, float b) {
         // Color() takes 0-1.0, so yeah convert
         var color = new Color(r / 255f, g / 255f, b / 255f);
         wall.material.color = color;
     }
 
     // change floor material variation
-    public void ChangeFloorMaterial(int variation = 0)
-    {
+    public void ChangeFloorMaterial(int variation = 0) {
         floor.material = floorMaterials[variation];
     }
 
     // change floor color
-    public void ChangeFloorColor(float r, float g, float b)
-    {
+    public void ChangeFloorColor(float r, float g, float b) {
         // Color() takes 0-1.0, so yeah convert
         var color = new Color(r / 255f, g / 255f, b / 255f);
         floor.material.color = color;
@@ -255,17 +227,14 @@ public List<Vector3> ReturnValidSpawns(
         int variation,
         SimObjPhysics targetReceptacle,
         float yRot = 0
-    )
-    {
+    ) {
         toSpawn = null;
 
-        if (objType == "screen")
-        {
+        if (objType == "screen") {
             toSpawn = screensToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
-        if (objType == "receptacle")
-        {
+        if (objType == "receptacle") {
             toSpawn = receptaclesToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
@@ -287,8 +256,7 @@ public List<Vector3> ReturnValidSpawns(
         List<Vector3> returnCoordinates = new List<Vector3>();
 
         // try and place object at every spawn coordinate and if it works, add it to the valid coords to return
-        for (int i = 0; i < spawnCoordinates.Count; i++)
-        {
+        for (int i = 0; i < spawnCoordinates.Count; i++) {
             // place object at the given point, then check if the corners are ok
             agent.placeObjectAtPoint(toSpawn, spawnCoordinates[i]);
 
@@ -296,10 +264,8 @@ public List<Vector3> ReturnValidSpawns(
 
             Contains con = targetReceptacle.ReceptacleTriggerBoxes[0].GetComponent<Contains>();
             bool cornerCheck = true;
-            foreach (Vector3 p in corners)
-            {
-                if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p))
-                {
+            foreach (Vector3 p in corners) {
+                if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p)) {
                     cornerCheck = false;
                     // this position would cause object to fall off table
                     // double back and reset object to try again with another point
@@ -308,8 +274,7 @@ public List<Vector3> ReturnValidSpawns(
                 }
             }
 
-            if (cornerCheck)
-            {
+            if (cornerCheck) {
                 returnCoordinates.Add(spawnCoordinates[i]);
                 // all corners were ok, so add it to the points that are valid
             }
@@ -336,24 +301,20 @@ public bool SpawnExperimentObjAtPoint(
         SimObjPhysics targetReceptacle,
         Vector3 point,
         float yRot = 0
-    )
-    {
+    ) {
         toSpawn = null;
 
         bool success = false;
 
-        if (objType == "screen")
-        {
+        if (objType == "screen") {
             toSpawn = screensToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
-        if (objType == "receptacle")
-        {
+        if (objType == "receptacle") {
             toSpawn = receptaclesToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
-        if (objType == "replacement")
-        {
+        if (objType == "replacement") {
             toSpawn = replacementObjectsToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
@@ -370,8 +331,7 @@ public bool SpawnExperimentObjAtPoint(
         // apply rotation to object, default quaternion.identity
         spawned.transform.Rotate(new Vector3(0, yRot, 0), Space.Self);
 
-        if (agent.placeObjectAtPoint(toSpawn, point))
-        {
+        if (agent.placeObjectAtPoint(toSpawn, point)) {
             // we set success to true, if one of the corners doesn't fit on the table
             // this will be switched to false and will be returned at the end
             success = true;
@@ -384,10 +344,8 @@ public bool SpawnExperimentObjAtPoint(
             List<Vector3> corners = GetCorners(spawned);
 
             Contains con = targetReceptacle.ReceptacleTriggerBoxes[0].GetComponent<Contains>();
-            foreach (Vector3 p in corners)
-            {
-                if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p))
-                {
+            foreach (Vector3 p in corners) {
+                if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p)) {
                     success = false;
                     // this position would cause object to fall off table
                     // double back and reset object to try again with another point
@@ -397,8 +355,7 @@ public bool SpawnExperimentObjAtPoint(
             }
         }
 
-        if (success)
-        {
+        if (success) {
             rb.isKinematic = false;
             // run scene setup to grab reference to object and give it objectId
             sceneManager.SetupScene();
@@ -407,8 +364,7 @@ public bool SpawnExperimentObjAtPoint(
 
         // no objects could be spawned at any of the spawn points
         // destroy the thing we tried to place on target receptacle
-        if (!success)
-        {
+        if (!success) {
             Destroy(spawned.transform.gameObject);
         }
 
@@ -423,21 +379,18 @@ public bool SpawnExperimentObjAtRandom(
         int seed,
         SimObjPhysics targetReceptacle,
         float yRot = 0
-    )
-    {
+    ) {
         toSpawn = null;
 
         bool success = false;
         // init random state
         UnityEngine.Random.InitState(seed);
 
-        if (objType == "screen")
-        {
+        if (objType == "screen") {
             toSpawn = screensToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
-        if (objType == "receptacle")
-        {
+        if (objType == "receptacle") {
             toSpawn = receptaclesToSpawn[variation].GetComponent<SimObjPhysics>();
         }
 
@@ -458,12 +411,10 @@ public bool SpawnExperimentObjAtRandom(
         // apply rotation to object, default quaternion.identity
         spawned.transform.Rotate(new Vector3(0, yRot, 0), Space.Self);
 
-        for (int i = 0; i < spawnCoordinates.Count; i++)
-        {
+        for (int i = 0; i < spawnCoordinates.Count; i++) {
             // place object at the given point, this also checks the spawn area to see if its clear
             // if not clear, it will return false
-            if (agent.placeObjectAtPoint(toSpawn, spawnCoordinates[i]))
-            {
+            if (agent.placeObjectAtPoint(toSpawn, spawnCoordinates[i])) {
                 // we set success to true, if one of the corners doesn't fit on the table
                 // this will be switched to false and will be returned at the end
                 success = true;
@@ -477,10 +428,8 @@ public bool SpawnExperimentObjAtRandom(
 
                 Contains con = targetReceptacle.ReceptacleTriggerBoxes[0].GetComponent<Contains>();
                 bool cornerCheck = true;
-                foreach (Vector3 p in corners)
-                {
-                    if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p))
-                    {
+                foreach (Vector3 p in corners) {
+                    if (!con.CheckIfPointIsAboveReceptacleTriggerBox(p)) {
                         cornerCheck = false;
                         // this position would cause object to fall off table
                         // double back and reset object to try again with another point
@@ -489,16 +438,14 @@ public bool SpawnExperimentObjAtRandom(
                     }
                 }
 
-                if (!cornerCheck)
-                {
+                if (!cornerCheck) {
                     success = false;
                     continue;
                 }
             }
 
             // if all corners were succesful, break out of this loop, don't keep trying
-            if (success)
-            {
+            if (success) {
                 rb.isKinematic = false;
                 // run scene setup to grab reference to object and give it objectId
                 sceneManager.SetupScene();
@@ -509,8 +456,7 @@ public bool SpawnExperimentObjAtRandom(
 
         // no objects could be spawned at any of the spawn points
         // destroy the thing we tried to place on target receptacle
-        if (!success)
-        {
+        if (!success) {
             Destroy(spawned.transform.gameObject);
         }
 
@@ -519,8 +465,7 @@ public bool SpawnExperimentObjAtRandom(
 
     // helper function to return world coordinates of all 8 corners of a
     // sim object's bounding box
-    private List<Vector3> GetCorners(SimObjPhysics sop)
-    {
+    private List<Vector3> GetCorners(SimObjPhysics sop) {
         // get corners of the bounding box of the object spawned in
         GameObject bb = sop.BoundingBox.transform.gameObject;
         BoxCollider bbcol = bb.GetComponent<BoxCollider>();
@@ -581,10 +526,8 @@ private List<Vector3> GetCorners(SimObjPhysics sop)
     }
 
 #if UNITY_EDITOR
-    void OnDrawGizmos()
-    {
-        foreach (Vector3 v in debugCoords)
-        {
+    void OnDrawGizmos() {
+        foreach (Vector3 v in debugCoords) {
             Gizmos.color = Color.red;
             Gizmos.DrawSphere(v, 0.05f);
         }
diff --git a/unity/Assets/Scripts/Extensions.cs b/unity/Assets/Scripts/Extensions.cs
index a2a57b014a..5049372db3 100644
--- a/unity/Assets/Scripts/Extensions.cs
+++ b/unity/Assets/Scripts/Extensions.cs
@@ -10,13 +10,10 @@
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 
-public static class ExtensionMethods
-{
-    public static T DeepClone<T>(this T obj)
-    {
+public static class ExtensionMethods {
+    public static T DeepClone<T>(this T obj) {
         // Don't serialize a null object, simply return the default for that object
-        if (ReferenceEquals(obj, null))
-        {
+        if (ReferenceEquals(obj, null)) {
             return default;
         }
 
@@ -24,8 +21,7 @@ public static T DeepClone<T>(this T obj)
         // for example in default constructor some list property initialized with some values,
         // but in 'source' these items are cleaned -
         // without ObjectCreationHandling.Replace default constructor values will be added to result
-        var deserializeSettings = new JsonSerializerSettings
-        {
+        var deserializeSettings = new JsonSerializerSettings {
             ObjectCreationHandling = ObjectCreationHandling.Replace
         };
 
@@ -33,8 +29,7 @@ public static T DeepClone<T>(this T obj)
         var str = Newtonsoft.Json.JsonConvert.SerializeObject(
             obj,
             Newtonsoft.Json.Formatting.None,
-            new Newtonsoft.Json.JsonSerializerSettings()
-            {
+            new Newtonsoft.Json.JsonSerializerSettings() {
                 ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                 ContractResolver = jsonResolver
             }
@@ -49,22 +44,17 @@ public static TValue GetValueOrDefault<TKey, TValue>(
         this Dictionary<TKey, TValue> dictionary,
         TKey key,
         TValue defaultValue = default(TValue)
-    )
-    {
+    ) {
         TValue value;
         return dictionary.TryGetValue(key, out value) ? value : defaultValue;
     }
 
-    public static int AddCount<TKey>(this Dictionary<TKey, int> dictionary, TKey key, int count = 1)
-    {
+    public static int AddCount<TKey>(this Dictionary<TKey, int> dictionary, TKey key, int count = 1) {
         int value;
         dictionary.TryGetValue(key, out value);
-        if (dictionary.ContainsKey(key))
-        {
+        if (dictionary.ContainsKey(key)) {
             dictionary[key] = dictionary[key] + count;
-        }
-        else
-        {
+        } else {
             dictionary[key] = count;
         }
         return dictionary[key];
@@ -72,8 +62,7 @@ public static int AddCount<TKey>(this Dictionary<TKey, int> dictionary, TKey key
 
     public static IEnumerable<IEnumerable<T>> CartesianProduct<T>(
         this IEnumerable<IEnumerable<T>> sequences
-    )
-    {
+    ) {
         IEnumerable<IEnumerable<T>> emptyProduct = new[] { Enumerable.Empty<T>() };
         return sequences.Aggregate(
             emptyProduct,
diff --git a/unity/Assets/Scripts/FifoServer.cs b/unity/Assets/Scripts/FifoServer.cs
index fdeb044f74..86dd645258 100644
--- a/unity/Assets/Scripts/FifoServer.cs
+++ b/unity/Assets/Scripts/FifoServer.cs
@@ -5,10 +5,8 @@
 using System.Net;
 using System.Text;
 
-namespace FifoServer
-{
-    public class Client
-    {
+namespace FifoServer {
+    public class Client {
         private static Client singletonClient;
         private int headerLength = 5;
         private FileStream serverPipe;
@@ -33,22 +31,18 @@ public class Client
             { "image_thirdParty_flow", FieldType.ThirdPartyFlow }
         };
 
-        public static int UnpackNetworkBytes(byte[] data, int offset = 0)
-        {
+        public static int UnpackNetworkBytes(byte[] data, int offset = 0) {
             int networkInt = System.BitConverter.ToInt32(data, offset);
             return IPAddress.NetworkToHostOrder(networkInt);
         }
 
-        public static byte[] PackNetworkBytes(int val)
-        {
+        public static byte[] PackNetworkBytes(int val) {
             int networkInt = IPAddress.HostToNetworkOrder(val);
             return System.BitConverter.GetBytes(networkInt);
         }
 
-        public string ReceiveMessage()
-        {
-            if (clientPipe == null)
-            {
+        public string ReceiveMessage() {
+            if (clientPipe == null) {
                 this.clientPipe = new FileStream(
                     this.clientPipePath,
                     FileMode.Open,
@@ -56,31 +50,26 @@ public string ReceiveMessage()
                 );
             }
             string action = null;
-            while (true)
-            {
+            while (true) {
                 byte[] header = new byte[headerLength];
                 int bytesRead = clientPipe.Read(header, 0, header.Length);
-                if (bytesRead == 0)
-                {
+                if (bytesRead == 0) {
                     throw new EndOfStreamException(
                         "zero bytes read trying to read header; assuming disconnect"
                     );
                 }
                 FieldType fieldType = (FieldType)header[0];
-                if (fieldType == FieldType.EndOfMessage)
-                {
+                if (fieldType == FieldType.EndOfMessage) {
                     // Console.WriteLine("Got eom");
                     break;
                 }
                 int fieldLength = UnpackNetworkBytes(header, 1);
                 byte[] body = new byte[fieldLength];
                 int totalBytesRead = 0;
-                while (totalBytesRead < body.Length)
-                {
+                while (totalBytesRead < body.Length) {
                     bytesRead = clientPipe.Read(body, totalBytesRead, body.Length - totalBytesRead);
                     // didn't read anything new, assume that we have a disconnect
-                    if (bytesRead == 0)
-                    {
+                    if (bytesRead == 0) {
                         throw new EndOfStreamException(
                             "number of bytes read did not change during body read; assuming disconnect"
                         );
@@ -88,8 +77,7 @@ public string ReceiveMessage()
                     totalBytesRead += bytesRead;
                 }
 
-                switch (fieldType)
-                {
+                switch (fieldType) {
                     case FieldType.Action:
                         // Console.WriteLine("Got action");
                         action = Encoding.Default.GetString(body);
@@ -101,16 +89,13 @@ public string ReceiveMessage()
             return action;
         }
 
-        public void SendEOM()
-        {
+        public void SendEOM() {
             serverPipe.Write(this.eomHeader, 0, this.headerLength);
             serverPipe.Flush();
         }
 
-        public void SendMessage(FieldType t, byte[] body)
-        {
-            if (this.serverPipe == null)
-            {
+        public void SendMessage(FieldType t, byte[] body) {
+            if (this.serverPipe == null) {
                 this.serverPipe = new FileStream(
                     this.serverPipePath,
                     FileMode.Open,
@@ -125,26 +110,22 @@ public void SendMessage(FieldType t, byte[] body)
             serverPipe.Write(body, 0, body.Length);
         }
 
-        private Client(string serverPipePath, string clientPipePath)
-        {
+        private Client(string serverPipePath, string clientPipePath) {
             this.serverPipePath = serverPipePath;
             this.clientPipePath = clientPipePath;
             this.eomHeader = new byte[headerLength];
             this.eomHeader[0] = (byte)FieldType.EndOfMessage;
         }
 
-        public static Client GetInstance(string serverPipePath, string clientPipePath)
-        {
-            if (singletonClient == null)
-            {
+        public static Client GetInstance(string serverPipePath, string clientPipePath) {
+            if (singletonClient == null) {
                 singletonClient = new Client(serverPipePath, clientPipePath);
             }
             return singletonClient;
         }
     }
 
-    public enum FieldType : byte
-    {
+    public enum FieldType : byte {
         Metadata = 0x01,
         Action = 0x02,
         ActionResult = 0x03,
diff --git a/unity/Assets/Scripts/Fill.cs b/unity/Assets/Scripts/Fill.cs
index c979d1e277..4121486184 100644
--- a/unity/Assets/Scripts/Fill.cs
+++ b/unity/Assets/Scripts/Fill.cs
@@ -4,8 +4,7 @@
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-public class Fill : MonoBehaviour
-{
+public class Fill : MonoBehaviour {
     [SerializeField]
     protected GameObject WaterObject = null;
 
@@ -22,25 +21,21 @@ public class Fill : MonoBehaviour
 
     public Dictionary<string, GameObject> Liquids = new Dictionary<string, GameObject>();
 
-    public bool IsFilled()
-    {
+    public bool IsFilled() {
         return isFilled;
     }
 
-    public string FilledLiquid()
-    {
+    public string FilledLiquid() {
         return currentlyFilledWith;
     }
 
-    void Awake()
-    {
+    void Awake() {
 #if UNITY_EDITOR
         if (
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeFilled)
-        )
-        {
+        ) {
             Debug.LogError(gameObject.name + " is missing the CanBeFilled secondary property!");
         }
 #endif
@@ -51,25 +46,20 @@ void Awake()
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // check if the object is rotated too much, if so it should spill out
-        if (Vector3.Angle(gameObject.transform.up, Vector3.up) > 90)
-        {
+        if (Vector3.Angle(gameObject.transform.up, Vector3.up) > 90) {
             // print("spilling!");
-            if (isFilled)
-            {
+            if (isFilled) {
                 EmptyObject();
             }
         }
     }
 
     // fill the object with a random liquid
-    public void FillObjectRandomLiquid()
-    {
+    public void FillObjectRandomLiquid() {
         int whichone = Random.Range(1, 3);
-        switch (whichone)
-        {
+        switch (whichone) {
             case 1:
                 FillObject("water");
                 break;
@@ -82,30 +72,25 @@ public void FillObjectRandomLiquid()
         }
     }
 
-    public void FillObject(string whichLiquid)
-    {
-        if (!Liquids.ContainsKey(whichLiquid))
-        {
+    public void FillObject(string whichLiquid) {
+        if (!Liquids.ContainsKey(whichLiquid)) {
             throw new ArgumentException("Unknown liquid: " + whichLiquid);
         }
 
         // check if this object has whichLiquid setup as fillable: If the object has a null reference this object
         // is not setup for that liquid
-        if (Liquids[whichLiquid] == null)
-        {
+        if (Liquids[whichLiquid] == null) {
             throw new ArgumentException($"The liquid {whichLiquid} is not setup for this object.");
         }
 
         Liquids[whichLiquid].transform.gameObject.SetActive(true);
 
         // coffee is hot so change the object's temperature if whichLiquid was coffee
-        if (whichLiquid == "coffee")
-        {
+        if (whichLiquid == "coffee") {
             // coffee is hot!
             SimObjPhysics sop = gameObject.GetComponent<SimObjPhysics>();
             sop.CurrentTemperature = Temperature.Hot;
-            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue())
-            {
+            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue()) {
                 sop.HowManySecondsUntilRoomTemp = sop.GetTimerResetValue();
             }
             sop.SetStartRoomTempTimer(false);
@@ -115,14 +100,11 @@ public void FillObject(string whichLiquid)
         currentlyFilledWith = whichLiquid;
     }
 
-    public void EmptyObject()
-    {
+    public void EmptyObject() {
         // for each thing in Liquids, if it exists set it to false and then set bools appropriately
-        foreach (KeyValuePair<string, GameObject> gogogo in Liquids)
-        {
+        foreach (KeyValuePair<string, GameObject> gogogo in Liquids) {
             // if the value field is not null and has a reference to a liquid object
-            if (gogogo.Value != null)
-            {
+            if (gogogo.Value != null) {
                 gogogo.Value.SetActive(false);
             }
         }
@@ -130,11 +112,9 @@ public void EmptyObject()
         isFilled = false;
     }
 
-    public void OnTriggerStay(Collider other)
-    {
+    public void OnTriggerStay(Collider other) {
         // if touching running water, automatically fill with water.
-        if (!isFilled && other.CompareTag("Liquid"))
-        {
+        if (!isFilled && other.CompareTag("Liquid")) {
             FillObject("water");
         }
     }
diff --git a/unity/Assets/Scripts/FirstPersonCharacterCull.cs b/unity/Assets/Scripts/FirstPersonCharacterCull.cs
index 1d52df674e..ce83224dd9 100644
--- a/unity/Assets/Scripts/FirstPersonCharacterCull.cs
+++ b/unity/Assets/Scripts/FirstPersonCharacterCull.cs
@@ -4,12 +4,10 @@
 using UnityStandardAssets.Characters.FirstPerson;
 
 [ExecuteInEditMode]
-public class FirstPersonCharacterCull : MonoBehaviour
-{
+public class FirstPersonCharacterCull : MonoBehaviour {
     private bool _stopCullingThingsForASecond = false;
 
-    public bool StopCullingThingsForASecond
-    {
+    public bool StopCullingThingsForASecond {
         get { return this._stopCullingThingsForASecond; }
         set { this._stopCullingThingsForASecond = value; }
     }
@@ -17,13 +15,10 @@ public bool StopCullingThingsForASecond
     public MeshRenderer[] RenderersToHide; // Mesh renderer that you want this script's camera to cull
     public BaseAgentComponent FPSController;
 
-    public void SwitchRenderersToHide(GameObject visibilityCapsule)
-    {
+    public void SwitchRenderersToHide(GameObject visibilityCapsule) {
         List<MeshRenderer> renderers = new List<MeshRenderer>();
-        foreach (var r in visibilityCapsule.GetComponentsInChildren<MeshRenderer>())
-        {
-            if (r.shadowCastingMode == ShadowCastingMode.Off)
-            {
+        foreach (var r in visibilityCapsule.GetComponentsInChildren<MeshRenderer>()) {
+            if (r.shadowCastingMode == ShadowCastingMode.Off) {
                 renderers.Add(r);
             }
         }
@@ -33,17 +28,14 @@ public void SwitchRenderersToHide(GameObject visibilityCapsule)
 
     void OnPreRender() // Just before this camera starts to render...
     {
-        if (!StopCullingThingsForASecond)
-        {
+        if (!StopCullingThingsForASecond) {
             if (
                 FPSController != null
                 && FPSController.agent != null
                 && (RenderersToHide != null || RenderersToHide.Length != 0)
                 && FPSController.agent.IsVisible
-            )
-            { // only do this if visibility capsule has been toggled on
-                foreach (MeshRenderer mr in RenderersToHide)
-                {
+            ) { // only do this if visibility capsule has been toggled on
+                foreach (MeshRenderer mr in RenderersToHide) {
                     mr.enabled = false; // Turn off renderer
                 }
             }
@@ -52,17 +44,14 @@ void OnPreRender() // Just before this camera starts to render...
 
     void OnPostRender() // Immediately after this camera renders...
     {
-        if (!StopCullingThingsForASecond)
-        {
+        if (!StopCullingThingsForASecond) {
             if (
                 FPSController != null
                 && FPSController.agent != null
                 && (RenderersToHide != null || RenderersToHide.Length != 0)
                 && FPSController.agent.IsVisible
-            )
-            { // only do this if visibility capsule is toggled on
-                foreach (MeshRenderer mr in RenderersToHide)
-                {
+            ) { // only do this if visibility capsule is toggled on
+                foreach (MeshRenderer mr in RenderersToHide) {
                     mr.enabled = true; // Turn it back on
                 }
             }
diff --git a/unity/Assets/Scripts/Flame.cs b/unity/Assets/Scripts/Flame.cs
index 7f41037216..28abb12afd 100644
--- a/unity/Assets/Scripts/Flame.cs
+++ b/unity/Assets/Scripts/Flame.cs
@@ -8,8 +8,7 @@
 // this means fire sources (the candle flame particle itself, stove top fire etc) must have a trigger box on it tagged fire so that this component can take care of itself.
 
 // for the cancle specifically, this box will control whether or not to turn the flame particle on or off, the flame particle itself has a triggerbox called tagged "flame" on it, so it can independantly be used to light another candle on fire
-public class Flame : MonoBehaviour
-{
+public class Flame : MonoBehaviour {
     // my parent object to find the CanToggleOnOff component
     public GameObject MyObject;
 
@@ -20,21 +19,16 @@ void Start() { }
     void Update() { }
 
     // if this touches water and it's on, it is put out. Fire safety is important!
-    public void OnTriggerStay(Collider MagiciansRed)
-    {
+    public void OnTriggerStay(Collider MagiciansRed) {
         // check if the fire zone is touching Liquid(running water effects) or StandingLiquid(filled water effects)
-        if (MagiciansRed.CompareTag("Liquid") || MagiciansRed.CompareTag("StandingLiquid"))
-        {
-            if (MyObject.GetComponent<CanToggleOnOff>().isOn)
-            {
+        if (MagiciansRed.CompareTag("Liquid") || MagiciansRed.CompareTag("StandingLiquid")) {
+            if (MyObject.GetComponent<CanToggleOnOff>().isOn) {
                 MyObject.GetComponent<CanToggleOnOff>().Toggle();
             }
         }
 
-        if (MagiciansRed.CompareTag("Fire"))
-        {
-            if (!MyObject.GetComponent<CanToggleOnOff>().isOn)
-            {
+        if (MagiciansRed.CompareTag("Fire")) {
+            if (!MyObject.GetComponent<CanToggleOnOff>().isOn) {
                 MyObject.GetComponent<CanToggleOnOff>().Toggle();
             }
         }
diff --git a/unity/Assets/Scripts/FpinMovableContinuous.cs b/unity/Assets/Scripts/FpinMovableContinuous.cs
index b1d5277f2a..fabefa08fb 100644
--- a/unity/Assets/Scripts/FpinMovableContinuous.cs
+++ b/unity/Assets/Scripts/FpinMovableContinuous.cs
@@ -3,34 +3,28 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class FpinMovableContinuous : MovableContinuous
-{
+public class FpinMovableContinuous : MovableContinuous {
     public CollisionListener collisionListener { get; private set; }
 
-    public FpinMovableContinuous(CollisionListener collisionListener)
-    {
+    public FpinMovableContinuous(CollisionListener collisionListener) {
         this.collisionListener = collisionListener;
     }
 
-    public string GetHaltMessage()
-    {
+    public string GetHaltMessage() {
         var staticCollisions = collisionListener?.StaticCollisions().ToList();
 
-        if (staticCollisions.Count > 0)
-        {
+        if (staticCollisions.Count > 0) {
             var sc = staticCollisions[0];
 
             // if we hit a sim object
-            if (sc.isSimObj)
-            {
+            if (sc.isSimObj) {
                 return "Collided with static/kinematic sim object: '"
                     + sc.simObjPhysics.name
                     + "', could not reach target.";
             }
 
             // if we hit a structural object that isn't a sim object but still has static collision
-            if (!sc.isSimObj)
-            {
+            if (!sc.isSimObj) {
                 return "Collided with static structure in scene: '"
                     + sc.gameObject.name
                     + "', could not reach target.";
@@ -39,18 +33,15 @@ public string GetHaltMessage()
         return "";
     }
 
-    public virtual bool ShouldHalt()
-    {
+    public virtual bool ShouldHalt() {
         return collisionListener.ShouldHalt();
     }
 
-    public virtual void ContinuousUpdate(float fixedDeltaTime)
-    {
+    public virtual void ContinuousUpdate(float fixedDeltaTime) {
         // Here would go the arm manipulation
     }
 
-    public virtual ActionFinished FinishContinuousMove(BaseFPSAgentController controller)
-    {
+    public virtual ActionFinished FinishContinuousMove(BaseFPSAgentController controller) {
         bool actionSuccess = !this.ShouldHalt();
         string errorMessage = this.GetHaltMessage();
 
diff --git a/unity/Assets/Scripts/FrameCollider.cs b/unity/Assets/Scripts/FrameCollider.cs
index 510f19e00f..b8287ff850 100644
--- a/unity/Assets/Scripts/FrameCollider.cs
+++ b/unity/Assets/Scripts/FrameCollider.cs
@@ -11,19 +11,16 @@
 // Move the four fCol objects so that the camera of the agent can raycast to them when the door is open and out of frame. These fCol objects should
 // frame the interior of the cabinet and since they are indivdual and isolated can be moved around to suite any shape or form interior space
 
-public class FrameCollider : MonoBehaviour
-{
+public class FrameCollider : MonoBehaviour {
     public Transform myObject;
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         myObject = gameObject.GetComponentInParent<SimObjPhysics>().transform;
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         // so we need to constantly update the rotation of this object so that the colliders stay in the right place.
         // unforunately we couldnt' just unparent them from the door because the door has the rigidbody, and if they were unparented then the
         // compound box collider would not propogate up to the rigidbody for visibility detection, so here we are this seems to work!
diff --git a/unity/Assets/Scripts/FreezeObject.cs b/unity/Assets/Scripts/FreezeObject.cs
index 79e51c078d..7cfe23f2d5 100644
--- a/unity/Assets/Scripts/FreezeObject.cs
+++ b/unity/Assets/Scripts/FreezeObject.cs
@@ -2,8 +2,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class FreezeObject : MonoBehaviour
-{
+public class FreezeObject : MonoBehaviour {
     public Space space = Space.World;
     public bool FreezePosition = false;
     public bool FreezeRotation = false;
@@ -14,54 +13,40 @@ public class FreezeObject : MonoBehaviour
     private Vector3 m_Position = Vector3.zero;
     private Quaternion m_Rotation = Quaternion.identity;
 
-    void Awake()
-    {
-        if (Application.isPlaying)
-        {
+    void Awake() {
+        if (Application.isPlaying) {
             Destroy(this);
         }
     }
 
-    void Update()
-    {
-        if (!Application.isEditor)
-        {
+    void Update() {
+        if (!Application.isEditor) {
             Destroy(this);
             return;
         }
-        if (FreezePosition)
-        {
+        if (FreezePosition) {
             // Save current position if enabled
-            if ((FreezePosition != m_OldFreezePosition) || (space != m_OldSpace))
-            {
+            if ((FreezePosition != m_OldFreezePosition) || (space != m_OldSpace)) {
                 m_Position = (space == Space.World) ? transform.position : transform.localPosition;
             }
 
             // Freeze the position
-            if (space == Space.World)
-            {
+            if (space == Space.World) {
                 transform.position = m_Position;
-            }
-            else
-            {
+            } else {
                 transform.localPosition = m_Position;
             }
         }
-        if (FreezeRotation)
-        {
+        if (FreezeRotation) {
             // Save current rotation if enabled
-            if ((FreezeRotation != m_OldFreezeRotation) || (space != m_OldSpace))
-            {
+            if ((FreezeRotation != m_OldFreezeRotation) || (space != m_OldSpace)) {
                 m_Rotation = (space == Space.World) ? transform.rotation : transform.localRotation;
             }
 
             // Freeze the rotation
-            if (space == Space.World)
-            {
+            if (space == Space.World) {
                 transform.rotation = m_Rotation;
-            }
-            else
-            {
+            } else {
                 transform.localRotation = m_Rotation;
             }
         }
diff --git a/unity/Assets/Scripts/Fridge.cs b/unity/Assets/Scripts/Fridge.cs
index 5fb5412c23..36893251aa 100644
--- a/unity/Assets/Scripts/Fridge.cs
+++ b/unity/Assets/Scripts/Fridge.cs
@@ -2,8 +2,7 @@
 using System.Collections;
 using UnityEngine;
 
-public class Fridge : MonoBehaviour
-{
+public class Fridge : MonoBehaviour {
     public SimObj ParentObj;
 
     public Transform[] Doors;
@@ -17,39 +16,32 @@ public class Fridge : MonoBehaviour
     Vector3 drawerTargetPosition;
     float distanceToTarget;
 
-    void Awake()
-    {
+    void Awake() {
         ParentObj = gameObject.GetComponent<SimObj>();
     }
 
-    void Update()
-    {
+    void Update() {
         bool open = false;
-        if (!ParentObj.IsAnimated)
-        {
+        if (!ParentObj.IsAnimated) {
             return;
         }
 
         open = ParentObj.Animator.GetBool("AnimState1");
 
-        switch (SceneManager.Current.AnimationMode)
-        {
+        switch (SceneManager.Current.AnimationMode) {
             case SceneAnimationMode.Instant:
             default:
-                for (int i = 0; i < Doors.Length; i++)
-                {
+                for (int i = 0; i < Doors.Length; i++) {
                     Doors[i].localEulerAngles = open ? OpenRotations[i] : ClosedRotations[i];
                 }
-                for (int i = 0; i < Drawers.Length; i++)
-                {
+                for (int i = 0; i < Drawers.Length; i++) {
                     Drawers[i].localPosition = open ? OpenPositions[i] : ClosedPositions[i];
                 }
                 break;
 
             case SceneAnimationMode.Smooth:
                 distanceToTarget = 0f;
-                for (int i = 0; i < Doors.Length; i++)
-                {
+                for (int i = 0; i < Doors.Length; i++) {
                     doorTargetRotation = open ? OpenRotations[i] : ClosedRotations[i];
                     Quaternion doorStartRotation = Doors[i].rotation;
                     Doors[i].localEulerAngles = doorTargetRotation;
@@ -64,8 +56,7 @@ void Update()
                         Vector3.Distance(Doors[i].localEulerAngles, doorTargetRotation)
                     );
                 }
-                for (int i = 0; i < Drawers.Length; i++)
-                {
+                for (int i = 0; i < Drawers.Length; i++) {
                     drawerTargetPosition = open ? OpenPositions[i] : ClosedPositions[i];
                     Drawers[i].localPosition = Vector3.Lerp(
                         Drawers[i].localPosition,
@@ -78,8 +69,7 @@ void Update()
                     );
                 }
 
-                if (distanceToTarget >= 360f)
-                {
+                if (distanceToTarget >= 360f) {
                     distanceToTarget -= 360f;
                 }
 
diff --git a/unity/Assets/Scripts/GenerateRoboTHOR.cs b/unity/Assets/Scripts/GenerateRoboTHOR.cs
index ef70c61d3d..9d925df97f 100644
--- a/unity/Assets/Scripts/GenerateRoboTHOR.cs
+++ b/unity/Assets/Scripts/GenerateRoboTHOR.cs
@@ -6,8 +6,7 @@
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-public class GenerateRoboTHOR : MonoBehaviour
-{
+public class GenerateRoboTHOR : MonoBehaviour {
     [SerializeField]
     protected GameObject wallPrefab;
 
@@ -49,8 +48,7 @@ public class GenerateRoboTHOR : MonoBehaviour
     protected float[] validStartingAgentRotations = new float[] { 0, 90, 180, 270 };
     protected string[] validOrientations = new string[] { "left", "right", "top", "bottom" };
 
-    protected class WallCell
-    {
+    protected class WallCell {
         public bool visited;
         public Dictionary<string, bool?> walls;
 
@@ -58,11 +56,9 @@ protected class WallCell
          * Walls are null if they are boundary walls. That is,
          * they are unable to be toggled on or off.
          */
-        public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom)
-        {
+        public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom) {
             this.visited = visited;
-            this.walls = new Dictionary<string, bool?>
-            {
+            this.walls = new Dictionary<string, bool?> {
                 ["left"] = left,
                 ["right"] = right,
                 ["top"] = top,
@@ -73,30 +69,24 @@ public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom)
 
     // Returns the neighbor cell if a wall boundary is removed, and returns
     // null if all neighbors have been visited.
-    protected (int, int)? VisitCell(int xGridCell, int zGridCell)
-    {
-        if (xGridCell < 0 || xGridCell >= xWalls)
-        {
+    protected (int, int)? VisitCell(int xGridCell, int zGridCell) {
+        if (xGridCell < 0 || xGridCell >= xWalls) {
             throw new ArgumentOutOfRangeException(
                 $"xGridCell must be in [0:xWalls), not {xGridCell}"
             );
-        }
-        else if (zGridCell < 0 || zGridCell >= zWalls)
-        {
+        } else if (zGridCell < 0 || zGridCell >= zWalls) {
             throw new ArgumentOutOfRangeException(
                 $"zGridCell must be in [0:zWalls), not {zGridCell}"
             );
         }
 
-        if (!wallCells[xGridCell, zGridCell].visited)
-        {
+        if (!wallCells[xGridCell, zGridCell].visited) {
             cellsVisited += 1;
             wallCells[xGridCell, zGridCell].visited = true;
         }
 
         List<string> choicesToRemove = new List<string>();
-        foreach (string orientation in validOrientations)
-        {
+        foreach (string orientation in validOrientations) {
             (int, int)? neighborCell = GetNeighbor(
                 xGridCell: xGridCell,
                 zGridCell: zGridCell,
@@ -106,15 +96,13 @@ public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom)
             if (
                 neighborCell.HasValue
                 && !wallCells[neighborCell.Value.Item1, neighborCell.Value.Item2].visited
-            )
-            {
+            ) {
                 choicesToRemove.Add(orientation);
             }
         }
 
         // all neighbors are visited
-        if (choicesToRemove.Count == 0)
-        {
+        if (choicesToRemove.Count == 0) {
             return null;
         }
 
@@ -135,50 +123,40 @@ public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom)
     /**
      * Returns the position of the neighbor. If the neighbor is out of bounds, null is returned.
      */
-    protected (int, int)? GetNeighbor(int xGridCell, int zGridCell, string orientation)
-    {
-        if (xGridCell < 0 || xGridCell >= xWalls)
-        {
+    protected (int, int)? GetNeighbor(int xGridCell, int zGridCell, string orientation) {
+        if (xGridCell < 0 || xGridCell >= xWalls) {
             throw new ArgumentOutOfRangeException(
                 $"xGridCell must be in [0:xWalls), not {xGridCell}"
             );
-        }
-        else if (zGridCell < 0 || zGridCell >= zWalls)
-        {
+        } else if (zGridCell < 0 || zGridCell >= zWalls) {
             throw new ArgumentOutOfRangeException(
                 $"zGridCell must be in [0:zWalls), not {zGridCell}"
             );
         }
 
-        if (!wallCells[xGridCell, zGridCell].walls[orientation].HasValue)
-        {
+        if (!wallCells[xGridCell, zGridCell].walls[orientation].HasValue) {
             return null;
         }
 
         // remove neighboring instance
-        switch (orientation)
-        {
+        switch (orientation) {
             case "left":
-                if (xGridCell > 0)
-                {
+                if (xGridCell > 0) {
                     return (xGridCell - 1, zGridCell);
                 }
                 break;
             case "right":
-                if (xGridCell < xWalls - 1)
-                {
+                if (xGridCell < xWalls - 1) {
                     return (xGridCell + 1, zGridCell);
                 }
                 break;
             case "bottom":
-                if (zGridCell < zWalls - 1)
-                {
+                if (zGridCell < zWalls - 1) {
                     return (xGridCell, zGridCell + 1);
                 }
                 break;
             case "top":
-                if (zGridCell > 0)
-                {
+                if (zGridCell > 0) {
                     return (xGridCell, zGridCell - 1);
                 }
                 break;
@@ -195,21 +173,18 @@ public WallCell(bool visited, bool? left, bool? right, bool? top, bool? bottom)
         int xGridCell,
         int zGridCell,
         string orientation
-    )
-    {
+    ) {
         (int, int)? neighbor = GetNeighbor(
             xGridCell: xGridCell,
             zGridCell: zGridCell,
             orientation: orientation
         );
 
-        if (!neighbor.HasValue)
-        {
+        if (!neighbor.HasValue) {
             return null;
         }
 
-        switch (orientation)
-        {
+        switch (orientation) {
             case "left":
                 wallCells[neighbor.Value.Item1, neighbor.Value.Item2].walls["right"] = false;
                 break;
@@ -230,16 +205,12 @@ string orientation
      * @param xGridCell is in [0:xWalls)
      * @param zGridCell is in [0:zWalls)
      */
-    protected Vector3 GetWallGridPointCenter(int xGridCell, int zGridCell)
-    {
-        if (xGridCell < 0 || xGridCell >= xWalls)
-        {
+    protected Vector3 GetWallGridPointCenter(int xGridCell, int zGridCell) {
+        if (xGridCell < 0 || xGridCell >= xWalls) {
             throw new ArgumentOutOfRangeException(
                 $"xGridCell must be in [0:xWalls), not {xGridCell}"
             );
-        }
-        else if (zGridCell < 0 || zGridCell >= zWalls)
-        {
+        } else if (zGridCell < 0 || zGridCell >= zWalls) {
             throw new ArgumentOutOfRangeException(
                 $"zGridCell must be in [0:zWalls), not {zGridCell}"
             );
@@ -263,16 +234,12 @@ protected Vector3 GetWallGridPointCenter(int xGridCell, int zGridCell)
      * @param xGridCell is in [0:xWalls)
      * @param zGridCell is in [0:zWalls)
      */
-    protected Vector3 GetAgentGridPointCenter(int xGridCell, int zGridCell)
-    {
-        if (xGridCell < 0 || xGridCell >= xWalls)
-        {
+    protected Vector3 GetAgentGridPointCenter(int xGridCell, int zGridCell) {
+        if (xGridCell < 0 || xGridCell >= xWalls) {
             throw new ArgumentOutOfRangeException(
                 $"xGridCell must be in [0:xWalls), not {xGridCell}"
             );
-        }
-        else if (zGridCell < 0 || zGridCell >= zWalls)
-        {
+        } else if (zGridCell < 0 || zGridCell >= zWalls) {
             throw new ArgumentOutOfRangeException(
                 $"zGridCell must be in [0:zWalls), not {zGridCell}"
             );
@@ -304,12 +271,10 @@ protected Vector3 GetAgentGridPointCenter(int xGridCell, int zGridCell)
     /**
      * Place a single wall at a position and orientation.
      */
-    protected void PlaceWall(Vector3 gridPointCenter, string orientation)
-    {
+    protected void PlaceWall(Vector3 gridPointCenter, string orientation) {
         Quaternion rotation;
         Vector3 position = new Vector3(gridPointCenter.x, gridPointCenter.y, gridPointCenter.z);
-        switch (orientation)
-        {
+        switch (orientation) {
             case "top":
                 rotation = Quaternion.Euler(0, 180, 0);
                 break;
@@ -341,8 +306,7 @@ protected void PlaceWall(Vector3 gridPointCenter, string orientation)
     /**
      * Place a single wall at a position and orientation.
      */
-    protected void PlaceWall(int xGridCell, int zGridCell, string orientation)
-    {
+    protected void PlaceWall(int xGridCell, int zGridCell, string orientation) {
         Vector3 gridPointCenter = GetWallGridPointCenter(
             xGridCell: xGridCell,
             zGridCell: zGridCell
@@ -353,35 +317,27 @@ protected void PlaceWall(int xGridCell, int zGridCell, string orientation)
     /**
      * Place all the walls based on wallCells.
      */
-    protected void PlaceWalls()
-    {
-        for (int x = 0; x < xWalls; x++)
-        {
+    protected void PlaceWalls() {
+        for (int x = 0; x < xWalls; x++) {
             PlaceWall(xGridCell: x, zGridCell: 0, orientation: "top");
         }
-        for (int z = 0; z < zWalls; z++)
-        {
+        for (int z = 0; z < zWalls; z++) {
             PlaceWall(xGridCell: 0, zGridCell: z, orientation: "left");
         }
 
-        for (int x = 0; x < xWalls; x++)
-        {
-            for (int z = 0; z < zWalls; z++)
-            {
-                if (wallCells[x, z].walls["right"] != false)
-                {
+        for (int x = 0; x < xWalls; x++) {
+            for (int z = 0; z < zWalls; z++) {
+                if (wallCells[x, z].walls["right"] != false) {
                     PlaceWall(xGridCell: x, zGridCell: z, orientation: "right");
                 }
-                if (wallCells[x, z].walls["bottom"] != false)
-                {
+                if (wallCells[x, z].walls["bottom"] != false) {
                     PlaceWall(xGridCell: x, zGridCell: z, orientation: "bottom");
                 }
             }
         }
     }
 
-    protected void AddOuterWalls()
-    {
+    protected void AddOuterWalls() {
         GameObject wall;
 
         // side 1
@@ -457,15 +413,12 @@ protected void AddOuterWalls()
         );
     }
 
-    protected void PlaceCeilings()
-    {
+    protected void PlaceCeilings() {
         int xCeilings = (int)Math.Ceiling((xWalls + 2 * boundaryPadding) / ceilingSizeX);
         int zCeilings = (int)Math.Ceiling((zWalls + 2 * boundaryPadding) / ceilingSizeZ);
 
-        for (int x = 0; x < xCeilings; x++)
-        {
-            for (int z = 0; z < zCeilings; z++)
-            {
+        for (int x = 0; x < xCeilings; x++) {
+            for (int z = 0; z < zCeilings; z++) {
                 // Place ceilings
                 Instantiate(
                     original: ceilingPrefab,
@@ -498,16 +451,13 @@ public void GenerateConfig(
         int xWalls = 16,
         int zWalls = 8,
         int boundaryPadding = 0
-    )
-    {
-        if (xWalls <= 0 || zWalls <= 0)
-        {
+    ) {
+        if (xWalls <= 0 || zWalls <= 0) {
             throw new ArgumentOutOfRangeException(
                 $"Must use > 0 walls in each direction, not xWalls={xWalls}, zWalls={zWalls}."
             );
         }
-        if (boundaryPadding < 0)
-        {
+        if (boundaryPadding < 0) {
             throw new ArgumentOutOfRangeException(
                 $"boundaryPadding must be >= 0, not {boundaryPadding}"
             );
@@ -522,17 +472,14 @@ public void GenerateConfig(
 
         // There is a single floor tile under the agent at the start so that it
         // is caught by gravity.
-        for (int i = floorParent.childCount - 1; i >= 0; i--)
-        {
+        for (int i = floorParent.childCount - 1; i >= 0; i--) {
             Destroy(floorParent.GetChild(i).gameObject);
         }
 
         PlaceCeilings();
 
-        for (int x = 0; x < xWalls + boundaryPadding * 2; x++)
-        {
-            for (int z = 0; z < zWalls + boundaryPadding * 2; z++)
-            {
+        for (int x = 0; x < xWalls + boundaryPadding * 2; x++) {
+            for (int z = 0; z < zWalls + boundaryPadding * 2; z++) {
                 Instantiate(
                     original: floorPrefab,
                     parent: floorParent,
@@ -551,8 +498,7 @@ public void GenerateConfig(
         // Only necessary because Initialize can be called within the
         // editor without calling Reset(). However, this is not supported
         // from the Python API.
-        for (int i = wallParent.childCount - 1; i >= 0; i--)
-        {
+        for (int i = wallParent.childCount - 1; i >= 0; i--) {
             Destroy(wallParent.GetChild(i).gameObject);
         }
 #endif
@@ -561,10 +507,8 @@ public void GenerateConfig(
         cellsVisited = 0;
 
         // Start with walls everywhere!
-        for (int x = 0; x < xWalls; x++)
-        {
-            for (int z = 0; z < zWalls; z++)
-            {
+        for (int x = 0; x < xWalls; x++) {
+            for (int z = 0; z < zWalls; z++) {
                 wallCells[x, z] = new WallCell(
                     visited: false,
                     left: x == 0 ? (bool?)null : true,
@@ -579,16 +523,12 @@ public void GenerateConfig(
         Stack<(int, int)> stack = new Stack<(int, int)>();
         (int, int) startingPosition = (Random.Range(0, xWalls), Random.Range(0, zWalls));
         stack.Push(startingPosition);
-        while (cellsVisited != xWalls * zWalls)
-        {
+        while (cellsVisited != xWalls * zWalls) {
             (int xGridCell, int zGridCell) = stack.Peek();
             (int, int)? neighbor = VisitCell(xGridCell: xGridCell, zGridCell: zGridCell);
-            if (neighbor.HasValue)
-            {
+            if (neighbor.HasValue) {
                 stack.Push(neighbor.Value);
-            }
-            else
-            {
+            } else {
                 stack.Pop();
             }
         }
diff --git a/unity/Assets/Scripts/GetAllScenesInstanceCount.cs b/unity/Assets/Scripts/GetAllScenesInstanceCount.cs
index eebfb46c50..c6e5633e88 100644
--- a/unity/Assets/Scripts/GetAllScenesInstanceCount.cs
+++ b/unity/Assets/Scripts/GetAllScenesInstanceCount.cs
@@ -16,8 +16,7 @@
 //     public Dictionary<SimObjType, int> objectTypeCountInScene = new Dictionary<SimObjType, int>();
 // }
 
-public class GetAllScenesInstanceCount : MonoBehaviour
-{
+public class GetAllScenesInstanceCount : MonoBehaviour {
     // [MenuItem("GameObject/Test")]
     // private static void TestGetPrefabInstanceHandle()
     // {
diff --git a/unity/Assets/Scripts/GroupCommand.cs b/unity/Assets/Scripts/GroupCommand.cs
index 4f9ab74992..a1047ba412 100644
--- a/unity/Assets/Scripts/GroupCommand.cs
+++ b/unity/Assets/Scripts/GroupCommand.cs
@@ -2,21 +2,17 @@
 using UnityEngine;
 
 #if UNITY_EDITOR
-public static class GroupCommand
-{
+public static class GroupCommand {
     [MenuItem("GameObject/Group Selected %g")]
-    private static void GroupSelected()
-    {
-        if (!Selection.activeTransform)
-        {
+    private static void GroupSelected() {
+        if (!Selection.activeTransform) {
             return;
         }
 
         var go = new GameObject(Selection.activeTransform.name + " Group");
         Undo.RegisterCreatedObjectUndo(go, "Group Selected");
         go.transform.SetParent(Selection.activeTransform.parent, false);
-        foreach (var transform in Selection.transforms)
-        {
+        foreach (var transform in Selection.transforms) {
             Undo.SetTransformParent(transform, go.transform, "Group Selected");
         }
 
diff --git a/unity/Assets/Scripts/HeatZone.cs b/unity/Assets/Scripts/HeatZone.cs
index e5d9bb325e..ada873db22 100644
--- a/unity/Assets/Scripts/HeatZone.cs
+++ b/unity/Assets/Scripts/HeatZone.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class HeatZone : MonoBehaviour
-{
+public class HeatZone : MonoBehaviour {
     // in preparation for different kinds of cooking rather than a single abstracted cooked/uncooked state....
     // this is to make sure that Microwaves don't switch bread slices into their toasted version, because microwaves can't do that
     public bool CanToastBread = true;
@@ -14,16 +13,13 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    public void OnTriggerStay(Collider other)
-    {
-        if (other.GetComponentInParent<SimObjPhysics>())
-        {
+    public void OnTriggerStay(Collider other) {
+        if (other.GetComponentInParent<SimObjPhysics>()) {
             // Set temperature of object to HOT
             SimObjPhysics sop = other.GetComponentInParent<SimObjPhysics>();
             sop.CurrentTemperature = Temperature.Hot;
 
-            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue())
-            {
+            if (sop.HowManySecondsUntilRoomTemp != sop.GetTimerResetValue()) {
                 sop.HowManySecondsUntilRoomTemp = sop.GetTimerResetValue();
             }
 
@@ -31,23 +27,18 @@ public void OnTriggerStay(Collider other)
             //
 
             // now if the object is able to be cooked, automatically cook it
-            if (sop.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeCooked))
-            {
+            if (sop.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeCooked)) {
                 CookObject sopcook = sop.GetComponent<CookObject>();
 
                 // if the object is bread... check if CanToastBread is true, and if so proceed to cook
-                if (sop.Type == SimObjType.BreadSliced && CanToastBread == true)
-                {
-                    if (!sopcook.IsCooked())
-                    {
+                if (sop.Type == SimObjType.BreadSliced && CanToastBread == true) {
+                    if (!sopcook.IsCooked()) {
                         sopcook.Cook();
                     }
                 }
                 // oh it's not bread, no worries just cook it now
-                else if (sop.Type != SimObjType.BreadSliced)
-                {
-                    if (!sopcook.IsCooked())
-                    {
+                else if (sop.Type != SimObjType.BreadSliced) {
+                    if (!sopcook.IsCooked()) {
                         sopcook.Cook();
                     }
                 }
diff --git a/unity/Assets/Scripts/HoleMetadata.cs b/unity/Assets/Scripts/HoleMetadata.cs
index a6afb1542b..d62d5abcb5 100644
--- a/unity/Assets/Scripts/HoleMetadata.cs
+++ b/unity/Assets/Scripts/HoleMetadata.cs
@@ -3,8 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-public class HoleMetadata : MonoBehaviour
-{
+public class HoleMetadata : MonoBehaviour {
     [DraggablePoint]
     public Vector3 Min;
 
@@ -12,8 +11,7 @@ public class HoleMetadata : MonoBehaviour
     public Vector3 Max;
     public Vector3 Margin;
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         // Box collider green
         //Gizmos.color = new Color(145.0f/255.0f, 245.0f/255.0f, 139/255.0f, 1.0f);
 
@@ -54,16 +52,14 @@ void OnDrawGizmos()
             corners.Skip(4).ToList()
         };
 
-        foreach (var q in sides)
-        {
+        foreach (var q in sides) {
             foreach (
                 var (first, second) in q.Zip(
                         q.Skip(3).Concat(q.Take(3)),
                         (first, second) => (first, second)
                     )
                     .Concat(sides[0].Zip(sides[1], (first, second) => (first, second)))
-            )
-            {
+            ) {
                 Gizmos.DrawLine(first, second);
             }
         }
diff --git a/unity/Assets/Scripts/IK_Robot_Arm_Controller.cs b/unity/Assets/Scripts/IK_Robot_Arm_Controller.cs
index d64ab0734a..d468cbadb3 100644
--- a/unity/Assets/Scripts/IK_Robot_Arm_Controller.cs
+++ b/unity/Assets/Scripts/IK_Robot_Arm_Controller.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public partial class IK_Robot_Arm_Controller : ArmController
-{
+public partial class IK_Robot_Arm_Controller : ArmController {
     [SerializeField]
     private Transform armBase,
         elbowTarget,
@@ -30,60 +29,49 @@ public partial class IK_Robot_Arm_Controller : ArmController
 
     private const float extendedArmLength = 0.6325f;
 
-    public override GameObject GetArmTarget()
-    {
+    public override GameObject GetArmTarget() {
         return armTarget.gameObject;
     }
 
-    public override Transform pickupParent()
-    {
+    public override Transform pickupParent() {
         return magnetSphere.transform;
     }
 
-    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset) {
         return handCameraTransform.TransformPoint(offset)
             - handCameraTransform.TransformPoint(Vector3.zero);
     }
 
-    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset) {
         return this.transform.TransformPoint(offset) - this.transform.TransformPoint(Vector3.zero);
     }
 
-    public override Vector3 pointToWristSpace(Vector3 point)
-    {
+    public override Vector3 pointToWristSpace(Vector3 point) {
         return handCameraTransform.TransformPoint(point);
     }
 
-    public override Vector3 pointToArmBaseSpace(Vector3 point)
-    {
+    public override Vector3 pointToArmBaseSpace(Vector3 point) {
         return this.transform.Find("robot_arm_FK_IK_rig").transform.TransformPoint(point);
     }
 
-    public override void ContinuousUpdate(float fixedDeltaTime)
-    {
+    public override void ContinuousUpdate(float fixedDeltaTime) {
         Debug.Log("manipulate Arm called from IK_Robot_Arm_Controller");
         solver.ManipulateArm();
     }
 
-    public GameObject GetArmBase()
-    {
+    public GameObject GetArmBase() {
         return armBase.gameObject;
     }
 
-    public GameObject GetElbowTarget()
-    {
+    public GameObject GetElbowTarget() {
         return elbowTarget.gameObject;
     }
 
-    public GameObject GetMagnetSphere()
-    {
+    public GameObject GetMagnetSphere() {
         return magnetSphere.gameObject;
     }
 
-    protected override void lastStepCallback()
-    {
+    protected override void lastStepCallback() {
         Vector3 pos = handCameraTransform.transform.position;
         Quaternion rot = handCameraTransform.transform.rotation;
         armTarget.position = pos;
@@ -96,8 +84,7 @@ protected override void lastStepCallback()
     //  }
 
 
-    void Start()
-    {
+    void Start() {
         // calculating based on distance from origin of arm to the 2nd joint, which will always be constant
         this.originToShoulderLength = Vector3.Distance(
             this.transform.FirstChildOrDefault(x => x.name == "robot_arm_2_jnt").position,
@@ -118,10 +105,8 @@ void Start()
 
         // clean up arm colliders, removing triggers
         List<CapsuleCollider> cleanedCaps = new List<CapsuleCollider>();
-        foreach (CapsuleCollider c in armCaps)
-        {
-            if (!c.isTrigger)
-            {
+        foreach (CapsuleCollider c in armCaps) {
+            if (!c.isTrigger) {
                 cleanedCaps.Add(c);
             }
         }
@@ -129,10 +114,8 @@ void Start()
         ArmCapsuleColliders = cleanedCaps.ToArray();
 
         List<BoxCollider> cleanedBoxes = new List<BoxCollider>();
-        foreach (BoxCollider b in armBoxes)
-        {
-            if (!b.isTrigger)
-            {
+        foreach (BoxCollider b in armBoxes) {
+            if (!b.isTrigger) {
                 cleanedBoxes.Add(b);
             }
         }
@@ -141,10 +124,8 @@ void Start()
 
         // TODO: Currently explicitly ignoring all arm self collisions (for efficiency)!
         var colliders = this.GetComponentsInChildren<Collider>();
-        foreach (Collider c0 in colliders)
-        {
-            foreach (Collider c1 in colliders)
-            {
+        foreach (Collider c0 in colliders) {
+            foreach (Collider c1 in colliders) {
                 Physics.IgnoreCollision(c0, c1);
             }
         }
@@ -152,8 +133,7 @@ void Start()
     }
 
     // Restricts front hemisphere for arm movement
-    protected override bool validArmTargetPosition(Vector3 targetWorldPosition)
-    {
+    protected override bool validArmTargetPosition(Vector3 targetWorldPosition) {
         Vector3 targetShoulderSpace = (
             this.transform.InverseTransformPoint(targetWorldPosition)
             - new Vector3(0, 0, originToShoulderLength)
@@ -170,8 +150,7 @@ public IEnumerator rotateWristAroundPoint(
         float degreesPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed = false
-    )
-    {
+    ) {
         collisionListener.Reset();
         return withLastStepCallback(
             ContinuousMovement.rotateAroundPoint(
@@ -193,8 +172,7 @@ public IEnumerator rotateElbowRelative(
         float degreesPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed = false
-    )
-    {
+    ) {
         collisionListener.Reset();
         GameObject poleManipulator = GameObject.Find("IK_pole_manipulator");
         Quaternion rotation = Quaternion.Euler(0f, 0f, degrees);
@@ -217,8 +195,7 @@ public IEnumerator rotateElbow(
         float degreesPerSecond,
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed = false
-    )
-    {
+    ) {
         GameObject poleManipulator = GameObject.Find("IK_pole_manipulator");
         return rotateElbowRelative(
             controller: controller,
@@ -229,8 +206,7 @@ public IEnumerator rotateElbow(
         );
     }
 
-    public override ArmMetadata GenerateMetadata()
-    {
+    public override ArmMetadata GenerateMetadata() {
         ArmMetadata meta = new ArmMetadata();
         // meta.handTarget = armTarget.position;
         Transform joint = transform;
@@ -243,8 +219,7 @@ public override ArmMetadata GenerateMetadata()
         Quaternion currentRotation;
 
         // Assign joint metadata to remaining joints, which all have identical hierarchies
-        for (int i = 1; i <= 4; i++)
-        {
+        for (int i = 1; i <= 4; i++) {
             joint = joint.Find("robot_arm_" + i + "_jnt");
 
             JointMetadata jointMeta = new JointMetadata();
@@ -268,8 +243,7 @@ public override ArmMetadata GenerateMetadata()
             currentRotation = joint.GetChild(0).rotation;
 
             // Check that world-relative rotation is angle-axis-notation-compatible
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
 
                 jointMeta.rotation = new Vector4(
@@ -278,9 +252,7 @@ public override ArmMetadata GenerateMetadata()
                     vectorRot.z,
                     ConvertAngleToZeroCentricRange(angleRot)
                 );
-            }
-            else
-            {
+            } else {
                 jointMeta.rotation = new Vector4(1, 0, 0, 0);
             }
 
@@ -291,8 +263,7 @@ public override ArmMetadata GenerateMetadata()
             currentRotation = Quaternion.Inverse(armBase.rotation) * joint.GetChild(0).rotation;
 
             // Check that root-relative rotation is angle-axis-notation-compatible
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                 jointMeta.rootRelativeRotation = new Vector4(
                     vectorRot.x,
@@ -300,15 +271,12 @@ public override ArmMetadata GenerateMetadata()
                     vectorRot.z,
                     ConvertAngleToZeroCentricRange(angleRot)
                 );
-            }
-            else
-            {
+            } else {
                 jointMeta.rootRelativeRotation = new Vector4(1, 0, 0, 0);
             }
 
             // PARENT-JOINT RELATIVE ROTATION
-            if (i != 1)
-            {
+            if (i != 1) {
                 parentJoint = joint.parent;
 
                 // Grab rotation of current joint's angler relative to parent joint's angler
@@ -317,8 +285,7 @@ public override ArmMetadata GenerateMetadata()
                     * joint.GetChild(0).rotation;
 
                 // Check that parent-relative rotation is angle-axis-notation-compatible
-                if (currentRotation != new Quaternion(0, 0, 0, -1))
-                {
+                if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                     currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                     jointMeta.localRotation = new Vector4(
                         vectorRot.x,
@@ -326,14 +293,10 @@ public override ArmMetadata GenerateMetadata()
                         vectorRot.z,
                         ConvertAngleToZeroCentricRange(angleRot)
                     );
-                }
-                else
-                {
+                } else {
                     jointMeta.localRotation = new Vector4(1, 0, 0, 0);
                 }
-            }
-            else
-            {
+            } else {
                 // Special case for robot_arm_1_jnt because it has no parent-joint
                 jointMeta.localRotation = jointMeta.rootRelativeRotation;
 
@@ -350,10 +313,8 @@ public override ArmMetadata GenerateMetadata()
         // note this is different from objects intersecting the hand's sphere,
         // there could be a case where an object is inside the sphere but not picked up by the hand
         List<string> heldObjectIDs = new List<string>();
-        if (heldObjects != null)
-        {
-            foreach (SimObjPhysics sop in heldObjects.Keys)
-            {
+        if (heldObjects != null) {
+            foreach (SimObjPhysics sop in heldObjects.Keys) {
                 heldObjectIDs.Add(sop.objectID);
             }
         }
@@ -370,22 +331,18 @@ public override ArmMetadata GenerateMetadata()
         return meta;
     }
 
-    float ConvertAngleToZeroCentricRange(float degrees)
-    {
-        if (degrees < 0)
-        {
+    float ConvertAngleToZeroCentricRange(float degrees) {
+        if (degrees < 0) {
             degrees = (degrees % 360f) + 360f;
         }
-        if (degrees > 180f)
-        {
+        if (degrees > 180f) {
             degrees = (degrees % 360f) - 360f;
         }
         return degrees;
     }
 
 #if UNITY_EDITOR
-    public class GizmoDrawCapsule
-    {
+    public class GizmoDrawCapsule {
         public Vector3 p0;
         public Vector3 p1;
         public float radius;
@@ -393,12 +350,9 @@ public class GizmoDrawCapsule
 
     List<GizmoDrawCapsule> debugCapsules = new List<GizmoDrawCapsule>();
 
-    private void OnDrawGizmos()
-    {
-        if (debugCapsules.Count > 0)
-        {
-            foreach (GizmoDrawCapsule thing in debugCapsules)
-            {
+    private void OnDrawGizmos() {
+        if (debugCapsules.Count > 0) {
+            foreach (GizmoDrawCapsule thing in debugCapsules) {
                 Gizmos.DrawWireSphere(thing.p0, thing.radius);
                 Gizmos.DrawWireSphere(thing.p1, thing.radius);
             }
diff --git a/unity/Assets/Scripts/IgnoreCollision.cs b/unity/Assets/Scripts/IgnoreCollision.cs
index c7354b9093..31a92009b3 100644
--- a/unity/Assets/Scripts/IgnoreCollision.cs
+++ b/unity/Assets/Scripts/IgnoreCollision.cs
@@ -3,43 +3,36 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class IgnoreCollision : MonoBehaviour
-{
+public class IgnoreCollision : MonoBehaviour {
     public Collider[] myColliders;
     public GameObject objectToIgnoreCollisionsWith = null;
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
         SetupIgnoreCollision();
     }
 
     // Update is called once per frame
     void Update() { }
 
-    public void SetupIgnoreCollision()
-    {
-        if (gameObject.GetComponentInParent<SimObjPhysics>() && myColliders.Length == 0)
-        {
+    public void SetupIgnoreCollision() {
+        if (gameObject.GetComponentInParent<SimObjPhysics>() && myColliders.Length == 0) {
             myColliders = gameObject.GetComponentInParent<SimObjPhysics>().MyColliders;
         }
 
         Collider[] otherCollidersToIgnore = null;
 
         // if the object to ignore has been manually set already
-        if (objectToIgnoreCollisionsWith != null)
-        {
+        if (objectToIgnoreCollisionsWith != null) {
             // do this if we are ignoring a sim object like a dresser with drawers in it
-            if (objectToIgnoreCollisionsWith.GetComponent<SimObjPhysics>())
-            {
+            if (objectToIgnoreCollisionsWith.GetComponent<SimObjPhysics>()) {
                 otherCollidersToIgnore = objectToIgnoreCollisionsWith
                     .GetComponent<SimObjPhysics>()
                     .MyColliders;
             }
 
             // do this if we are ignoring the agent
-            if (objectToIgnoreCollisionsWith.GetComponent<BaseAgentComponent>())
-            {
+            if (objectToIgnoreCollisionsWith.GetComponent<BaseAgentComponent>()) {
                 otherCollidersToIgnore = new Collider[]
                 {
                     objectToIgnoreCollisionsWith
@@ -49,8 +42,7 @@ public void SetupIgnoreCollision()
             }
         }
 #if UNITY_EDITOR
-        else
-        {
+        else {
             Debug.LogError(
                 "IgnoreCollision on "
                     + gameObject.transform.name
@@ -62,11 +54,9 @@ public void SetupIgnoreCollision()
         // else
         // otherCollidersToIgnore = gameObject.GetComponentInParent<SimObjPhysics>().MyColliders;
 
-        foreach (Collider col in myColliders)
-        {
+        foreach (Collider col in myColliders) {
             // Physics.IgnoreCollision(col 1, col2, true) with all combinations?
-            foreach (Collider otherCol in otherCollidersToIgnore)
-            {
+            foreach (Collider otherCol in otherCollidersToIgnore) {
                 Physics.IgnoreCollision(col, otherCol);
             }
         }
diff --git a/unity/Assets/Scripts/ImageSynthesis/ColorEncoding.cs b/unity/Assets/Scripts/ImageSynthesis/ColorEncoding.cs
index 91258e86e8..0932090dcb 100644
--- a/unity/Assets/Scripts/ImageSynthesis/ColorEncoding.cs
+++ b/unity/Assets/Scripts/ImageSynthesis/ColorEncoding.cs
@@ -1,29 +1,23 @@
 using System.Security.Cryptography;
 using UnityEngine;
 
-public class ColorEncoding
-{
-    public static byte ReverseBits(byte value)
-    {
+public class ColorEncoding {
+    public static byte ReverseBits(byte value) {
         return (byte)((value * 0x0202020202 & 0x010884422010) % 1023);
     }
 
-    public static int SparsifyBits(byte value, int sparse)
-    {
+    public static int SparsifyBits(byte value, int sparse) {
         int retVal = 0;
-        for (int bits = 0; bits < 8; bits++, value >>= 1)
-        {
+        for (int bits = 0; bits < 8; bits++, value >>= 1) {
             retVal |= (value & 1);
             retVal <<= sparse;
         }
         return retVal >> sparse;
     }
 
-    public static Color EncodeIDAsColor(int instanceId)
-    {
+    public static Color EncodeIDAsColor(int instanceId) {
         var uid = instanceId * 2;
-        if (uid < 0)
-        {
+        if (uid < 0) {
             uid = -uid + 1;
         }
 
@@ -41,18 +35,15 @@ public static Color EncodeIDAsColor(int instanceId)
         return new Color32(r, g, b, 255);
     }
 
-    public static Color EncodeTagAsColor(string tag)
-    {
-        using (MD5 md5 = MD5.Create())
-        {
+    public static Color EncodeTagAsColor(string tag) {
+        using (MD5 md5 = MD5.Create()) {
             byte[] data = md5.ComputeHash(System.Text.Encoding.Default.GetBytes(tag));
 
             return new Color32(data[0], data[1], data[2], data[3]);
         }
     }
 
-    public static Color EncodeLayerAsColor(int layer)
-    {
+    public static Color EncodeLayerAsColor(int layer) {
         // Following value must be in the range (0.5 .. 1.0)
         // in order to avoid color overlaps when using 'divider' in this func
         var z = .7f;
diff --git a/unity/Assets/Scripts/ImageSynthesis/ExampleUI.cs b/unity/Assets/Scripts/ImageSynthesis/ExampleUI.cs
index 6e330a9104..09ff92d09c 100644
--- a/unity/Assets/Scripts/ImageSynthesis/ExampleUI.cs
+++ b/unity/Assets/Scripts/ImageSynthesis/ExampleUI.cs
@@ -4,16 +4,13 @@
 using UnityEngine.SceneManagement;
 
 [RequireComponent(typeof(ImageSynthesis))]
-public class ExampleUI : MonoBehaviour
-{
+public class ExampleUI : MonoBehaviour {
     public int width = 320;
     public int height = 200;
     private int imageCounter = 1;
 
-    void OnGUI()
-    {
-        if (GUILayout.Button("Captcha!!! (" + imageCounter + ")"))
-        {
+    void OnGUI() {
+        if (GUILayout.Button("Captcha!!! (" + imageCounter + ")")) {
             var sceneName = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
             // NOTE: due to per-camera / per-object motion being calculated late in the frame and after Update()
             // capturing is moved into LateUpdate (see ImageSynthesis.cs Known Issues)
diff --git a/unity/Assets/Scripts/ImageSynthesis/ImageSynthesis.cs b/unity/Assets/Scripts/ImageSynthesis/ImageSynthesis.cs
index 889719df1f..e72c6f766b 100644
--- a/unity/Assets/Scripts/ImageSynthesis/ImageSynthesis.cs
+++ b/unity/Assets/Scripts/ImageSynthesis/ImageSynthesis.cs
@@ -18,8 +18,7 @@
 //      2) rendering several cameras with different aspect ratios - vectors do stretch to the sides of the screen
 
 [RequireComponent(typeof(Camera))]
-public class ImageSynthesis : MonoBehaviour
-{
+public class ImageSynthesis : MonoBehaviour {
     private bool initialized = false;
 
     // pass configuration
@@ -40,15 +39,13 @@ public class ImageSynthesis : MonoBehaviour
         // new CapturePass() { name = "_position" },
     };
 
-    struct CapturePass
-    {
+    struct CapturePass {
         // configuration
         public string name;
         public bool supportsAntialiasing;
         public bool needsRescale;
 
-        public CapturePass(string name_)
-        {
+        public CapturePass(string name_) {
             name = name_;
             supportsAntialiasing = true;
             needsRescale = false;
@@ -59,24 +56,18 @@ public CapturePass(string name_)
         public Camera camera;
     };
 
-    public bool hasCapturePass(string name)
-    {
-        for (int i = 0; i < capturePasses.Length; i++)
-        {
-            if (capturePasses[i].name == name)
-            {
+    public bool hasCapturePass(string name) {
+        for (int i = 0; i < capturePasses.Length; i++) {
+            if (capturePasses[i].name == name) {
                 return true;
             }
         }
         return false;
     }
 
-    public void updateCameraStatuses(bool enabled)
-    {
-        for (int i = 0; i < capturePasses.Length; i++)
-        {
-            if (capturePasses[i].camera != null && capturePasses[i].name != "_img")
-            {
+    public void updateCameraStatuses(bool enabled) {
+        for (int i = 0; i < capturePasses.Length; i++) {
+            if (capturePasses[i].camera != null && capturePasses[i].name != "_img") {
                 capturePasses[i].camera.enabled = enabled;
             }
         }
@@ -103,12 +94,10 @@ public void updateCameraStatuses(bool enabled)
 
     public Texture2D tex;
 
-    public void OnEnable()
-    {
+    public void OnEnable() {
         // This initialization code MUST live in OnEnable and not Start as we instantiate ThirdPartyCameras
         // programatically in other functions and need them to be initialized immediately.
-        if (!initialized)
-        {
+        if (!initialized) {
             // XXXXXXXXXXX************
             // Remember, adding any new Shaders requires them to be included in Project Settings->Graphics->Always Included Shaders
             // otherwise the standlone will build without the shaders and you will be sad
@@ -116,20 +105,17 @@ public void OnEnable()
 
             // default fallbacks, if shaders are unspecified
 
-            if (!uberReplacementShader)
-            {
+            if (!uberReplacementShader) {
                 uberReplacementShader = Shader.Find("Hidden/UberReplacement");
             }
 
-            if (!opticalFlowShader)
-            {
+            if (!opticalFlowShader) {
                 opticalFlowShader = Shader.Find("Hidden/OpticalFlow");
             }
 
 #if UNITY_EDITOR
 
-            if (!depthShader)
-            {
+            if (!depthShader) {
                 depthShader = Shader.Find("Hidden/DepthBW");
             }
 #else
@@ -145,8 +131,7 @@ public void OnEnable()
 
             // use real camera to capture final image
             capturePasses[0].camera = GetComponent<Camera>();
-            for (int q = 1; q < capturePasses.Length; q++)
-            {
+            for (int q = 1; q < capturePasses.Length; q++) {
                 capturePasses[q].camera = CreateHiddenCamera(capturePasses[q].name);
             }
             md5 = System.Security.Cryptography.MD5.Create();
@@ -157,11 +142,9 @@ public void OnEnable()
         initialized = true;
     }
 
-    void LateUpdate()
-    {
+    void LateUpdate() {
 #if UNITY_EDITOR
-        if (DetectPotentialSceneChangeInEditor())
-        {
+        if (DetectPotentialSceneChangeInEditor()) {
             OnSceneChange();
         }
 
@@ -171,8 +154,7 @@ void LateUpdate()
         // OnCameraChange();
     }
 
-    private Camera CreateHiddenCamera(string name)
-    {
+    private Camera CreateHiddenCamera(string name) {
         var go = new GameObject(name, typeof(Camera));
 #if !UNITY_EDITOR // Useful to be able to see these cameras in the editor
         go.hideFlags = HideFlags.HideAndDontSave;
@@ -195,8 +177,7 @@ private Camera CreateHiddenCamera(string name)
         return newCamera;
     }
 
-    private static void SetupCameraWithReplacementShader(Camera cam, Shader shader)
-    {
+    private static void SetupCameraWithReplacementShader(Camera cam, Shader shader) {
         var cb = new CommandBuffer();
         cam.AddCommandBuffer(CameraEvent.BeforeForwardOpaque, cb);
         cam.AddCommandBuffer(CameraEvent.BeforeFinalPass, cb);
@@ -209,8 +190,7 @@ private static void SetupCameraWithReplacementShader(
         Camera cam,
         Shader shader,
         ReplacelementModes mode
-    )
-    {
+    ) {
         SetupCameraWithReplacementShader(cam, shader, mode, Color.blue);
     }
 
@@ -219,8 +199,7 @@ private static void SetupCameraWithReplacementShader(
         Shader shader,
         ReplacelementModes mode,
         Color clearColor
-    )
-    {
+    ) {
         var cb = new CommandBuffer();
         cb.SetGlobalFloat("_OutputMode", (int)mode); // @TODO: CommandBuffer is missing SetGlobalInt() method
         cam.renderingPath = RenderingPath.Forward;
@@ -235,16 +214,14 @@ private static void SetupCameraWithPostShader(
         Camera cam,
         Material material,
         DepthTextureMode depthTextureMode = DepthTextureMode.None
-    )
-    {
+    ) {
         var cb = new CommandBuffer();
         cb.Blit(null, BuiltinRenderTextureType.CurrentActive, material);
         cam.AddCommandBuffer(CameraEvent.AfterEverything, cb);
         cam.depthTextureMode = depthTextureMode;
     }
 
-    enum ReplacelementModes
-    {
+    enum ReplacelementModes {
         ObjectId = 0,
         CatergoryId = 1,
         DepthCompressed = 2,
@@ -255,10 +232,8 @@ enum ReplacelementModes
 
     // Call this if the settings on the main camera ever change? But the main camera now uses slightly different layer masks and deffered/forward render settings than these image synth cameras
     // do, so maybe it's fine for now I dunno
-    public void OnCameraChange()
-    {
-        if (tex != null)
-        {
+    public void OnCameraChange() {
+        if (tex != null) {
             Destroy(tex);
             tex = null;
         }
@@ -267,10 +242,8 @@ public void OnCameraChange()
         // TODO: add tests, not needed when target display is different
         // mainCamera.depth = 9999; // This ensures the main camera is rendered on screen
 
-        foreach (var pass in capturePasses)
-        {
-            if (pass.camera == mainCamera)
-            {
+        foreach (var pass in capturePasses) {
+            if (pass.camera == mainCamera) {
                 continue;
             }
 
@@ -289,14 +262,12 @@ public void OnCameraChange()
         }
 
         // cache materials and setup material properties
-        if (!opticalFlowMaterial || opticalFlowMaterial.shader != opticalFlowShader)
-        {
+        if (!opticalFlowMaterial || opticalFlowMaterial.shader != opticalFlowShader) {
             opticalFlowMaterial = new Material(opticalFlowShader);
         }
         opticalFlowMaterial.SetFloat("_Sensitivity", opticalFlowSensitivity);
 
-        if (!depthMaterial || depthMaterial.shader != depthShader)
-        {
+        if (!depthMaterial || depthMaterial.shader != depthShader) {
             depthMaterial = new Material(depthShader);
         }
 
@@ -326,8 +297,7 @@ public void OnCameraChange()
         );
 
 #if UNITY_EDITOR
-        for (int i = 0; i < capturePasses.Length; i++)
-        {
+        for (int i = 0; i < capturePasses.Length; i++) {
             // Debug.Log("Setting camera " + capturePasses[i].camera.gameObject.name + " to display " + i);
             capturePasses[i].camera.targetDisplay = i;
         }
@@ -338,31 +308,25 @@ public void OnCameraChange()
         */
     }
 
-    public string MD5Hash(string input)
-    {
+    public string MD5Hash(string input) {
         byte[] data = md5.ComputeHash(System.Text.Encoding.Default.GetBytes(input));
         // Create string representation
         System.Text.StringBuilder sb = new System.Text.StringBuilder();
-        for (int i = 0; i < data.Length; ++i)
-        {
+        for (int i = 0; i < data.Length; ++i) {
             sb.Append(data[i].ToString("x2"));
         }
         return sb.ToString();
     }
 
-    private string getObjectId(GameObject gameObject)
-    {
+    private string getObjectId(GameObject gameObject) {
         // the object id is generated this way to handle the edge case
         // where a non-simobject could get moved from its initial position
         // during a simulation.  This forces the objectId to get generated once
         // on scene startup
         int key = gameObject.GetInstanceID();
-        if (nonSimObjObjectIds.ContainsKey(key))
-        {
+        if (nonSimObjObjectIds.ContainsKey(key)) {
             return nonSimObjObjectIds[key];
-        }
-        else
-        {
+        } else {
             Transform t = gameObject.transform;
             string objectId =
                 gameObject.name + "|" + t.position.x + "|" + t.position.y + "|" + t.position.z;
@@ -371,15 +335,13 @@ private string getObjectId(GameObject gameObject)
         }
     }
 
-    public void OnSceneChange()
-    {
+    public void OnSceneChange() {
         sentColorCorrespondence = false;
         var renderers = UnityEngine.Object.FindObjectsOfType<Renderer>();
         colorIds = new Dictionary<Color, string>();
         var mpb = new MaterialPropertyBlock();
 
-        foreach (var r in renderers)
-        {
+        foreach (var r in renderers) {
             // var layer = r.gameObject.layer;
             // var tag = r.gameObject.tag;
 
@@ -387,24 +349,20 @@ public void OnSceneChange()
             string objTag = getObjectId(r.gameObject);
 
             StructureObject so = r.gameObject.GetComponent<StructureObject>();
-            if (so == null)
-            {
+            if (so == null) {
                 so = r.gameObject.GetComponentInParent<StructureObject>();
             }
 
             SimObjPhysics sop = r.gameObject.GetComponent<SimObjPhysics>();
-            if (sop == null)
-            {
+            if (sop == null) {
                 sop = r.gameObject.GetComponentInParent<SimObjPhysics>();
             }
 
-            if (so != null)
-            {
+            if (so != null) {
                 classTag = "" + so.WhatIsMyStructureObjectTag;
                 // objTag = so.gameObject.name;
             }
-            if (sop != null)
-            {
+            if (sop != null) {
                 classTag = "" + sop.Type;
                 objTag = sop.ObjectID;
             }
@@ -414,13 +372,10 @@ public void OnSceneChange()
 
             capturePasses[0].camera.WorldToScreenPoint(r.bounds.center);
 
-            if (so != null || sop != null)
-            {
+            if (so != null || sop != null) {
                 colorIds[objColor] = objTag;
                 colorIds[classColor] = classTag;
-            }
-            else
-            {
+            } else {
                 colorIds[objColor] = r.gameObject.name;
             }
 
@@ -429,8 +384,7 @@ public void OnSceneChange()
             if (
                 r.gameObject.name.ToLower().Contains("lightray")
                 && r.material.name.ToLower().Contains("lightray")
-            )
-            {
+            ) {
                 r.enabled = false;
                 continue;
             }
@@ -452,23 +406,18 @@ public byte[] Encode(
         int width = -1,
         int height = -1,
         bool jpg = false
-    )
-    {
+    ) {
         // Must be called after end of Frame
 
-        if (width <= 0)
-        {
+        if (width <= 0) {
             width = Screen.width;
         }
-        if (height <= 0)
-        {
+        if (height <= 0) {
             height = Screen.height;
         }
 
-        foreach (var pass in capturePasses)
-        {
-            if (pass.name == passName)
-            {
+        foreach (var pass in capturePasses) {
+            if (pass.name == passName) {
                 return Encode(
                     pass.camera,
                     width,
@@ -485,17 +434,14 @@ public byte[] Encode(
         return (new byte[0]);
     }
 
-    public void Save(string filename, int width = -1, int height = -1, string path = "")
-    {
-        if (width <= 0 || height <= 0)
-        {
+    public void Save(string filename, int width = -1, int height = -1, string path = "") {
+        if (width <= 0 || height <= 0) {
             width = Screen.width;
             height = Screen.height;
         }
 
         var filenameExtension = System.IO.Path.GetExtension(filename);
-        if (filenameExtension == "")
-        {
+        if (filenameExtension == "") {
             filenameExtension = ".png";
         }
 
@@ -514,8 +460,7 @@ private IEnumerator WaitForEndOfFrameAndSave(
         string filenameExtension,
         int width,
         int height
-    )
-    {
+    ) {
         yield return new WaitForEndOfFrame();
         Save(filenameWithoutExtension, filenameExtension, width, height);
     }
@@ -525,10 +470,8 @@ private void Save(
         string filenameExtension,
         int width,
         int height
-    )
-    {
-        foreach (var pass in capturePasses)
-        {
+    ) {
+        foreach (var pass in capturePasses) {
             Save(
                 pass.camera,
                 filenameWithoutExtension + pass.name + filenameExtension,
@@ -549,8 +492,7 @@ private byte[] Encode(
         bool jpg = false,
         RenderTextureFormat format = RenderTextureFormat.Default,
         RenderTextureReadWrite textureReadMode = RenderTextureReadWrite.Default
-    )
-    {
+    ) {
         var mainCamera = GetComponent<Camera>();
         var depth = 32;
         var readWrite = textureReadMode;
@@ -575,8 +517,7 @@ private byte[] Encode(
                     readWrite,
                     antiAliasing
                 );
-        if (tex == null)
-        {
+        if (tex == null) {
             tex = new Texture2D(width, height, TextureFormat.RGBA32, false);
         }
 
@@ -589,8 +530,7 @@ private byte[] Encode(
 
         cam.Render();
 
-        if (needsRescale)
-        {
+        if (needsRescale) {
             // blit to rescale (see issue with Motion Vectors in @KNOWN ISSUES)
             RenderTexture.active = finalRT;
             Graphics.Blit(renderRT, finalRT);
@@ -608,12 +548,9 @@ private byte[] Encode(
 
         // encode texture into PNG/JPG
         byte[] bytes;
-        if (jpg)
-        {
+        if (jpg) {
             bytes = tex.EncodeToJPG();
-        }
-        else
-        {
+        } else {
             bytes = tex.GetRawTextureData();
         }
 
@@ -636,8 +573,7 @@ private void Save(
         int height,
         bool supportsAntialiasing,
         bool needsRescale
-    )
-    {
+    ) {
         byte[] bytes = Encode(cam, width, height, supportsAntialiasing, needsRescale);
         File.WriteAllBytes(filename, bytes);
     }
@@ -647,27 +583,22 @@ bool needsRescale
     private int lastSelectedGOLayer = -1;
     private string lastSelectedGOTag = "unknown";
 
-    private bool DetectPotentialSceneChangeInEditor()
-    {
+    private bool DetectPotentialSceneChangeInEditor() {
         bool change = false;
         // there is no callback in Unity Editor to automatically detect changes in scene objects
         // as a workaround lets track selected objects and check, if properties that are
         // interesting for us (layer or tag) did not change since the last frame
-        if (UnityEditor.Selection.transforms.Length > 1)
-        {
+        if (UnityEditor.Selection.transforms.Length > 1) {
             // multiple objects are selected, all bets are off!
             // we have to assume these objects are being edited
             change = true;
             lastSelectedGO = null;
-        }
-        else if (UnityEditor.Selection.activeGameObject)
-        {
+        } else if (UnityEditor.Selection.activeGameObject) {
             var go = UnityEditor.Selection.activeGameObject;
             // check if layer or tag of a selected object have changed since the last frame
             var potentialChangeHappened =
                 lastSelectedGOLayer != go.layer || lastSelectedGOTag != go.tag;
-            if (go == lastSelectedGO && potentialChangeHappened)
-            {
+            if (go == lastSelectedGO && potentialChangeHappened) {
                 change = true;
             }
 
diff --git a/unity/Assets/Scripts/InstantiatePrefabTest.cs b/unity/Assets/Scripts/InstantiatePrefabTest.cs
index c193289fc9..8b539258cf 100644
--- a/unity/Assets/Scripts/InstantiatePrefabTest.cs
+++ b/unity/Assets/Scripts/InstantiatePrefabTest.cs
@@ -6,8 +6,7 @@
 using UnityStandardAssets.Characters.FirstPerson;
 
 // this script manages the spawning/placing of sim objects in the scene
-public class InstantiatePrefabTest : MonoBehaviour
-{
+public class InstantiatePrefabTest : MonoBehaviour {
     public GameObject[] prefabs = null;
     private int spawnCount = 0;
 
@@ -24,19 +23,15 @@ public class InstantiatePrefabTest : MonoBehaviour
 
     // spawn an object from the Array of prefabs. Used to spawn from a specific set of Prefabs
     // used for Hide and Seek stuff
-    public SimObjPhysics Spawn(string prefabType, string objectId, Vector3 position)
-    {
+    public SimObjPhysics Spawn(string prefabType, string objectId, Vector3 position) {
         GameObject topObject = GameObject.Find("Objects");
 
-        foreach (GameObject prefab in prefabs)
-        {
-            if (prefab.name.Contains(prefabType))
-            {
+        foreach (GameObject prefab in prefabs) {
+            if (prefab.name.Contains(prefabType)) {
                 GameObject go = Instantiate(prefab, position, Quaternion.identity) as GameObject;
                 go.transform.SetParent(topObject.transform);
                 SimObjPhysics so = go.GetComponentInChildren<SimObjPhysics>();
-                if (so == null)
-                {
+                if (so == null) {
                     go.AddComponent<SimObjPhysics>();
                     so = go.GetComponentInChildren<SimObjPhysics>();
                 }
@@ -56,8 +51,7 @@ public SimObjPhysics SpawnObject(
         Vector3 position,
         Vector3 rotation,
         bool spawningInHand
-    )
-    {
+    ) {
         return SpawnObject(
             objectType,
             randomize,
@@ -69,26 +63,21 @@ bool spawningInHand
         );
     }
 
-    public Bounds BoundsOfObject(string objectType, int variation)
-    {
+    public Bounds BoundsOfObject(string objectType, int variation) {
         // GameObject topObject = GameObject.Find("Objects");
         List<GameObject> candidates = new List<GameObject>();
-        foreach (GameObject go in prefabs)
-        {
+        foreach (GameObject go in prefabs) {
             if (
                 go.GetComponent<SimObjPhysics>().Type
                 == (SimObjType)Enum.Parse(typeof(SimObjType), objectType)
-            )
-            {
+            ) {
                 candidates.Add(go);
             }
         }
 
         Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
-        foreach (Renderer r in candidates[variation - 1].GetComponentsInChildren<Renderer>())
-        {
-            if (r.enabled)
-            {
+        foreach (Renderer r in candidates[variation - 1].GetComponentsInChildren<Renderer>()) {
+            if (r.enabled) {
                 objBounds.Encapsulate(r.bounds);
             }
         }
@@ -113,20 +102,17 @@ public SimObjPhysics SpawnObject(
         Vector3 rotation,
         bool spawningInHand,
         bool ignoreChecks
-    )
-    {
+    ) {
         GameObject topObject = GameObject.Find("Objects");
 
         List<GameObject> candidates = new List<GameObject>();
 
-        foreach (GameObject go in prefabs)
-        {
+        foreach (GameObject go in prefabs) {
             // does a prefab of objectType exist in the current array of prefabs to spawn?
             if (
                 go.GetComponent<SimObjPhysics>().Type
                 == (SimObjType)Enum.Parse(typeof(SimObjType), objectType)
-            )
-            {
+            ) {
                 candidates.Add(go);
             }
         }
@@ -135,12 +121,10 @@ bool ignoreChecks
         SimObjPhysics simObj = null;
 
         // Figure out which variation to use, if no variation use first candidate found
-        if (randomize)
-        {
+        if (randomize) {
             variation = UnityEngine.Random.Range(1, candidates.Count);
         }
-        if (variation != 0)
-        {
+        if (variation != 0) {
             variation -= 1;
         }
 
@@ -154,11 +138,9 @@ bool ignoreChecks
                 quat,
                 spawningInHand
             )
-        )
-        {
+        ) {
             GameObject prefab = Instantiate(candidates[variation], position, quat) as GameObject;
-            if (!ignoreChecks)
-            {
+            if (!ignoreChecks) {
                 if (
                     UtilityFunctions.isObjectColliding(
                         prefab,
@@ -167,8 +149,7 @@ from agent in GameObject.FindObjectsOfType<BaseAgentComponent>()
                             select agent.gameObject
                         )
                     )
-                )
-                {
+                ) {
                     Debug.Log(
                         "On spawning object the area was not clear despite CheckSpawnArea saying it was."
                     );
@@ -179,15 +160,12 @@ select agent.gameObject
             prefab.transform.SetParent(topObject.transform);
             simObj = prefab.GetComponent<SimObjPhysics>();
             spawnCount++;
-        }
-        else
-        {
+        } else {
             return null;
         }
 
         // ok make sure we did actually spawn something now, and give it an Id number
-        if (simObj)
-        {
+        if (simObj) {
             simObj.objectID = objectType + "|" + spawnCount.ToString();
             return simObj;
         }
@@ -206,10 +184,8 @@ public bool PlaceObjectReceptacle(
         int maxPlacementAttempts,
         int degreeIncrement,
         bool AlwaysPlaceUpright
-    )
-    {
-        if (rsps == null)
-        {
+    ) {
+        if (rsps == null) {
 #if UNITY_EDITOR
             Debug.Log(
                 "Null list of points to check, please pass in populated list of <ReceptacleSpawnPoint>?"
@@ -217,39 +193,33 @@ bool AlwaysPlaceUpright
 #endif
             return false; // uh, there was nothing in the List for some reason, so failed to spawn
         }
-        if (rsps.Count == 0)
-        {
+        if (rsps.Count == 0) {
             return false;
         }
 
         List<ReceptacleSpawnPoint> goodRsps = new List<ReceptacleSpawnPoint>();
 
         // only add spawn points to try if the point's parent is not an object specific receptacle, that is handled in RandomSpawnRequiredSceneObjects
-        foreach (ReceptacleSpawnPoint p in rsps)
-        {
+        foreach (ReceptacleSpawnPoint p in rsps) {
             if (
                 !p
                     .ParentSimObjPhys.GetComponent<SimObjPhysics>()
                     .DoesThisObjectHaveThisSecondaryProperty(
                         SimObjSecondaryProperty.ObjectSpecificReceptacle
                     )
-            )
-            {
+            ) {
                 goodRsps.Add(p);
             }
         }
 
         // try a number of spawnpoints in this specific receptacle up to the maxPlacementAttempts
         int tries = 0;
-        foreach (ReceptacleSpawnPoint p in goodRsps)
-        {
-            if (PlaceObject(sop, p, PlaceStationary, degreeIncrement, AlwaysPlaceUpright))
-            {
+        foreach (ReceptacleSpawnPoint p in goodRsps) {
+            if (PlaceObject(sop, p, PlaceStationary, degreeIncrement, AlwaysPlaceUpright)) {
                 return true;
             }
             tries += 1;
-            if (maxPlacementAttempts > 0 && tries > maxPlacementAttempts)
-            {
+            if (maxPlacementAttempts > 0 && tries > maxPlacementAttempts) {
                 break;
             }
         }
@@ -268,10 +238,8 @@ public bool PlaceObjectReceptacleInViewport(
         int maxPlacementAttempts,
         int degreeIncrement,
         bool AlwaysPlaceUpright
-    )
-    {
-        if (rsps == null)
-        {
+    ) {
+        if (rsps == null) {
 #if UNITY_EDITOR
             Debug.Log(
                 "Null list of points to check, please pass in populated list of <ReceptacleSpawnPoint>?"
@@ -280,45 +248,38 @@ bool AlwaysPlaceUpright
             return false; // uh, there was nothing in the List for some reason, so failed to spawn
         }
 
-        if (rsps.Count == 0)
-        {
+        if (rsps.Count == 0) {
             return false;
         }
 
         List<ReceptacleSpawnPoint> goodRsps = new List<ReceptacleSpawnPoint>();
-        foreach (ReceptacleSpawnPoint p in rsps)
-        {
+        foreach (ReceptacleSpawnPoint p in rsps) {
             if (
                 !p
                     .ParentSimObjPhys.GetComponent<SimObjPhysics>()
                     .DoesThisObjectHaveThisSecondaryProperty(
                         SimObjSecondaryProperty.ObjectSpecificReceptacle
                     )
-            )
-            {
+            ) {
                 goodRsps.Add(p);
             }
         }
 
         int tries = 0;
-        foreach (ReceptacleSpawnPoint p in goodRsps)
-        {
+        foreach (ReceptacleSpawnPoint p in goodRsps) {
             // if this is an Object Specific Receptacle, stop this check right now! I mean it!
             // Placing objects in/on an Object Specific Receptacle uses different logic to place the
             // object at the Attachemnet point rather than in the spawn area, so stop this right now!
 
-            if (PlaceObject(sop, p, PlaceStationary, degreeIncrement, AlwaysPlaceUpright))
-            {
+            if (PlaceObject(sop, p, PlaceStationary, degreeIncrement, AlwaysPlaceUpright)) {
                 // check to make sure the placed object is within the viewport
-                if (agent.objectIsOnScreen(sop))
-                {
+                if (agent.objectIsOnScreen(sop)) {
                     return true;
                 }
             }
 
             tries += 1;
-            if (maxPlacementAttempts > 0 && tries > maxPlacementAttempts)
-            {
+            if (maxPlacementAttempts > 0 && tries > maxPlacementAttempts) {
                 break;
             }
         }
@@ -328,13 +289,11 @@ bool AlwaysPlaceUpright
     }
 
     // use this to keep track of a Rotation and Distance for use in PlaceObject
-    public class RotationAndDistanceValues
-    {
+    public class RotationAndDistanceValues {
         public float distance;
         public Quaternion rotation;
 
-        public RotationAndDistanceValues(float d, Quaternion r)
-        {
+        public RotationAndDistanceValues(float d, Quaternion r) {
             distance = d;
             rotation = r;
         }
@@ -346,10 +305,8 @@ public bool PlaceObject(
         bool PlaceStationary,
         int degreeIncrement,
         bool AlwaysPlaceUpright
-    )
-    {
-        if (rsp.ParentSimObjPhys == sop)
-        {
+    ) {
+        if (rsp.ParentSimObjPhys == sop) {
 #if UNITY_EDITOR
             Debug.Log("Can't place object inside itself!");
 #endif
@@ -379,12 +336,10 @@ bool AlwaysPlaceUpright
 
         // get rotations and distance values for 360/increment number of rotations around just the Y axis
         // we want to check all of these first so that the object is prioritized to be placed "upright"
-        for (int i = 0; i < HowManyRotationsToCheck; i++)
-        {
+        for (int i = 0; i < HowManyRotationsToCheck; i++) {
             oabb.enabled = true;
 
-            if (i > 0)
-            {
+            if (i > 0) {
                 sop.transform.Rotate(new Vector3(0, degreeIncrement, 0), Space.Self);
                 // ToCheck[i].rotation = sop.transform.rotation;
 
@@ -403,9 +358,7 @@ bool AlwaysPlaceUpright
                         sop.transform.rotation
                     )
                 );
-            }
-            else
-            {
+            } else {
                 // no rotate change just yet, check the first position
 
                 Vector3 Offset = oabb.ClosestPoint(
@@ -429,22 +382,18 @@ bool AlwaysPlaceUpright
         }
 
         // continue to check rotations about the X and Z axes if the object doesn't have to be placed upright
-        if (!AlwaysPlaceUpright)
-        {
+        if (!AlwaysPlaceUpright) {
             // ok now try if the X and Z local axis are rotated if it'll fit
             // these values can cause the object to be placed at crazy angles, so we'll check these last
-            for (int i = 0; i < HowManyRotationsToCheck; i++)
-            {
+            for (int i = 0; i < HowManyRotationsToCheck; i++) {
                 oabb.enabled = true;
 
-                if (i > 0)
-                {
+                if (i > 0) {
                     sop.transform.Rotate(new Vector3(0, degreeIncrement, 0), Space.Self);
                     Quaternion oldRotation = sop.transform.rotation;
 
                     // now add more points by rotating the x axis at this current y rotation
-                    for (int j = 0; j < HowManyRotationsToCheck; j++)
-                    {
+                    for (int j = 0; j < HowManyRotationsToCheck; j++) {
                         sop.transform.Rotate(new Vector3(degreeIncrement, 0, 0), Space.Self);
 
                         Vector3 Offset = oabb.ClosestPoint(
@@ -467,8 +416,7 @@ bool AlwaysPlaceUpright
                     sop.transform.rotation = oldRotation;
 
                     // now add EVEN more points by rotating the z axis at this current y rotation
-                    for (int j = 0; j < HowManyRotationsToCheck; j++)
-                    {
+                    for (int j = 0; j < HowManyRotationsToCheck; j++) {
                         sop.transform.Rotate(new Vector3(0, 0, degreeIncrement), Space.Self);
 
                         Vector3 Offset = oabb.ClosestPoint(
@@ -495,8 +443,7 @@ bool AlwaysPlaceUpright
             }
         }
 
-        foreach (RotationAndDistanceValues quat in ToCheck)
-        {
+        foreach (RotationAndDistanceValues quat in ToCheck) {
             // if spawn area is clear, spawn it and return true that we spawned it
             if (
                 CheckSpawnArea(
@@ -505,16 +452,14 @@ bool AlwaysPlaceUpright
                     quat.rotation,
                     false
                 )
-            )
-            {
+            ) {
                 // translate position of the target sim object to the rsp.Point and offset in local y up
                 sop.transform.position =
                     rsp.Point + rsp.ReceptacleBox.transform.up * (quat.distance + yoffset); // rsp.Point + sop.transform.up * DistanceFromBottomOfBoxToTransform;
                 sop.transform.rotation = quat.rotation;
 
                 //ensure transforms are synced
-                if (!Physics.autoSyncTransforms)
-                {
+                if (!Physics.autoSyncTransforms) {
                     Physics.SyncTransforms();
                 }
 
@@ -524,14 +469,12 @@ bool AlwaysPlaceUpright
                 // Check the ReceptacleBox's Sim Object component to see what Type it is. Then check to
                 // see if the type is the kind where the Object placed must be completely contained or just the bottom 4 corners contained
                 int HowManyCornersToCheck = 0;
-                if (ReceptacleRestrictions.OnReceptacles.Contains(rsp.ParentSimObjPhys.ObjType))
-                {
+                if (ReceptacleRestrictions.OnReceptacles.Contains(rsp.ParentSimObjPhys.ObjType)) {
                     // check that only the bottom 4 corners are in bounds
                     HowManyCornersToCheck = 4;
                 }
 
-                if (ReceptacleRestrictions.InReceptacles.Contains(rsp.ParentSimObjPhys.ObjType))
-                {
+                if (ReceptacleRestrictions.InReceptacles.Contains(rsp.ParentSimObjPhys.ObjType)) {
                     // check that all 8 corners are within bounds
                     HowManyCornersToCheck = 8;
                 }
@@ -540,8 +483,7 @@ bool AlwaysPlaceUpright
                     ReceptacleRestrictions.InReceptaclesThatOnlyCheckBottomFourCorners.Contains(
                         rsp.ParentSimObjPhys.ObjType
                     )
-                )
-                {
+                ) {
                     // only check bottom 4 corners even though the action is PlaceIn
                     HowManyCornersToCheck = 4;
                 }
@@ -553,8 +495,7 @@ bool AlwaysPlaceUpright
                 // now check the corner count for either the 4 lowest corners, or all 8 corners depending on Corner Count
                 // attmpt to sort corners so that first four corners are the corners closest to the spawn point we are checking against
                 SpawnCorners.Sort(
-                    delegate(Vector3 p1, Vector3 p2)
-                    {
+                    delegate (Vector3 p1, Vector3 p2) {
                         // sort by making a plane where rsp.point is, find the four corners closest to that point
                         // return rspPlane.GetDistanceToPoint(p1).CompareTo(rspPlane.GetDistanceToPoint(p2));
                         //^ this ended up not working because if something is placed at an angle this no longer makes sense...
@@ -572,17 +513,14 @@ bool AlwaysPlaceUpright
                 // originally this looped up to i < HowManyCornersToCheck, but if we just check all the corners, regardless of
                 // sort order, it seems to bypass the issue above of how to sort the corners to find the "bottom" 4 corners, so uh
                 // i guess this might just work without fancy sorting to determine the bottom 4 corners... especially since the "bottom corners" starts to lose meaning as objects are rotated
-                for (int i = 0; i < 8; i++)
-                {
-                    if (rsp.Script.CheckIfPointIsInsideReceptacleTriggerBox(SpawnCorners[i]))
-                    {
+                for (int i = 0; i < 8; i++) {
+                    if (rsp.Script.CheckIfPointIsInsideReceptacleTriggerBox(SpawnCorners[i])) {
                         CornerCount++;
                     }
                 }
 
                 // if not enough corners are inside the receptacle, abort
-                if (CornerCount < HowManyCornersToCheck)
-                {
+                if (CornerCount < HowManyCornersToCheck) {
                     sop.transform.rotation = originalRot;
                     sop.transform.position = originalPos;
                     return false;
@@ -590,10 +528,8 @@ bool AlwaysPlaceUpright
 
                 // one final check, make sure all corners of object are "above" the receptacle box in question, so we
                 // dont spawn stuff half on a table and it falls over
-                foreach (Vector3 v in SpawnCorners)
-                {
-                    if (!rsp.Script.CheckIfPointIsAboveReceptacleTriggerBox(v))
-                    {
+                foreach (Vector3 v in SpawnCorners) {
+                    if (!rsp.Script.CheckIfPointIsAboveReceptacleTriggerBox(v)) {
                         sop.transform.rotation = originalRot;
                         sop.transform.position = originalPos;
                         return false;
@@ -602,14 +538,12 @@ bool AlwaysPlaceUpright
 
                 // set true if we want objects to be stationary when placed. (if placed on uneven surface, object remains stationary)
                 // if false, once placed the object will resolve with physics (if placed on uneven surface object might slide or roll)
-                if (PlaceStationary)
-                {
+                if (PlaceStationary) {
                     // if the target receptacle is a pickupable receptacle, set it to kinematic true as will since we are placing stationary
                     if (
                         rsp.ParentSimObjPhys.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                         || rsp.ParentSimObjPhys.PrimaryProperty == SimObjPrimaryProperty.Moveable
-                    )
-                    {
+                    ) {
                         rsp.ParentSimObjPhys.GetComponent<Rigidbody>().isKinematic = true;
                     }
 
@@ -627,14 +561,12 @@ bool AlwaysPlaceUpright
                         sop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.Receptacle
                         )
-                    )
-                    {
+                    ) {
                         sop.DropContainedObjectsStationary(); // use stationary version so that colliders are turned back on, but kinematics remain true
                     }
                 }
                 // place stationary false, let physics drop everything too
-                else
-                {
+                else {
                     // if not placing stationary, put all objects under Objects game object
                     GameObject topObject = GameObject.Find("Objects");
                     // parent to the Objects transform
@@ -648,8 +580,7 @@ bool AlwaysPlaceUpright
                         sop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.Receptacle
                         )
-                    )
-                    {
+                    ) {
                         sop.DropContainedObjects(
                             reparentContainedObjects: true,
                             forceKinematic: false
@@ -678,15 +609,13 @@ public Collider ColliderHitByObjectInSpawnArea(
         Vector3 position,
         Quaternion rotation,
         bool spawningInHand
-    )
-    {
+    ) {
         int layermask;
 
         // first do a check to see if the area is clear
 
         // if spawning in the agent's hand, ignore collisions with the Agent
-        if (spawningInHand)
-        {
+        if (spawningInHand) {
             layermask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -694,9 +623,7 @@ bool spawningInHand
                 "Procedural3",
                 "Procedural0"
             );
-        }
-        else
-        {
+        } else {
             // oh we are spawning it somewhere in the environment, we do need to make sure not to spawn inside the agent or the environment
             layermask = LayerMask.GetMask(
                 "SimObjVisible",
@@ -711,19 +638,16 @@ bool spawningInHand
         // get list of all active colliders of sim object, then toggle them off for now
         // disable all colliders of the object being placed
         List<Collider> colsToDisable = new List<Collider>();
-        foreach (Collider g in simObj.MyColliders)
-        {
+        foreach (Collider g in simObj.MyColliders) {
             // only track this collider if it's enabled by default
             // some objects, like houseplants, might have colliders in their simObj.MyColliders that are disabled
-            if (g.enabled)
-            {
+            if (g.enabled) {
                 colsToDisable.Add(g);
             }
         }
 
         // disable collision before moving to check the spawn area
-        foreach (Collider c in colsToDisable)
-        {
+        foreach (Collider c in colsToDisable) {
             c.enabled = false;
         }
 
@@ -808,8 +732,7 @@ bool spawningInHand
         simObj.transform.rotation = originalRot;
 
         // re-enable the collision after returning in place
-        foreach (Collider c in colsToDisable)
-        {
+        foreach (Collider c in colsToDisable) {
             c.enabled = true;
         }
 
@@ -823,17 +746,12 @@ bool spawningInHand
         );
 
         // if a collider was hit, then the space is not clear to spawn
-        if (hitColliders.Length > 0)
-        {
+        if (hitColliders.Length > 0) {
             // filter out any AgentTriggerBoxes because those should be ignored now
-            foreach (Collider c in hitColliders)
-            {
-                if (c.isTrigger && c.GetComponentInParent<BaseAgentComponent>())
-                {
+            foreach (Collider c in hitColliders) {
+                if (c.isTrigger && c.GetComponentInParent<BaseAgentComponent>()) {
                     continue;
-                }
-                else
-                {
+                } else {
                     return c;
                 }
             }
@@ -848,8 +766,7 @@ public bool CheckSpawnArea(
         Vector3 position,
         Quaternion rotation,
         bool spawningInHand
-    )
-    {
+    ) {
         var hitColliders = ColliderHitByObjectInSpawnArea(
             simObj,
             position,
@@ -861,11 +778,9 @@ bool spawningInHand
     }
 
 #if UNITY_EDITOR
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.red;
-        if (m_Started)
-        {
+        if (m_Started) {
             Matrix4x4 cubeTransform = Matrix4x4.TRS(gizmopos, gizmoquaternion, gizmoscale);
             Matrix4x4 oldGizmosMatrix = Gizmos.matrix;
 
@@ -876,13 +791,10 @@ void OnDrawGizmos()
             Gizmos.matrix = oldGizmosMatrix;
         }
 
-        if (SpawnCorners != null)
-        {
+        if (SpawnCorners != null) {
             int count = 0;
-            foreach (Vector3 point in SpawnCorners)
-            {
-                if (count > 3)
-                {
+            foreach (Vector3 point in SpawnCorners) {
+                if (count > 3) {
                     Gizmos.color = Color.cyan;
                 }
 
diff --git a/unity/Assets/Scripts/JavaScriptInterface.cs b/unity/Assets/Scripts/JavaScriptInterface.cs
index 11522266e3..e4da39e082 100644
--- a/unity/Assets/Scripts/JavaScriptInterface.cs
+++ b/unity/Assets/Scripts/JavaScriptInterface.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class JavaScriptInterface : MonoBehaviour
-{
+public class JavaScriptInterface : MonoBehaviour {
     // IL2CPP throws exceptions about SendMetadata and Init not existing
     // so the body is only used for WebGL
 #if UNITY_WEBGL
diff --git a/unity/Assets/Scripts/KinovaArmAgentController.cs b/unity/Assets/Scripts/KinovaArmAgentController.cs
index 30143fc67d..831dccb339 100644
--- a/unity/Assets/Scripts/KinovaArmAgentController.cs
+++ b/unity/Assets/Scripts/KinovaArmAgentController.cs
@@ -6,18 +6,15 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public partial class KinovaArmAgentController : ArmAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public partial class KinovaArmAgentController : ArmAgentController {
         public KinovaArmAgentController(
             BaseAgentComponent baseAgentComponent,
             AgentManager agentManager
         )
             : base(baseAgentComponent, agentManager) { }
 
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             base.InitializeBody(initializeAction);
             Debug.Log("initializing arm");
             IKArm.SetActive(true);
@@ -36,11 +33,9 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             return ActionFinished.Success;
         }
 
-        private IK_Robot_Arm_Controller getArmImplementation()
-        {
+        private IK_Robot_Arm_Controller getArmImplementation() {
             IK_Robot_Arm_Controller arm = GetComponentInChildren<IK_Robot_Arm_Controller>();
-            if (arm == null)
-            {
+            if (arm == null) {
                 throw new InvalidOperationException(
                     "Agent does not have kinematic arm or is not enabled.\n"
                         + $"Make sure there is a '{typeof(IK_Robot_Arm_Controller).Name}' component as a child of this agent."
@@ -49,8 +44,7 @@ private IK_Robot_Arm_Controller getArmImplementation()
             return arm;
         }
 
-        protected override ArmController getArm()
-        {
+        protected override ArmController getArm() {
             return getArmImplementation();
         }
 
@@ -61,8 +55,7 @@ public void TeleportArm(
             float? elbowOrientation = null,
             bool worldRelative = false,
             bool forceAction = false
-        )
-        {
+        ) {
             GameObject heightManip = this.GetComponent<BaseAgentComponent>().IKArm;
             GameObject posRotManip = this.GetComponent<BaseAgentComponent>()
                 .IKArm.GetComponent<IK_Robot_Arm_Controller>()
@@ -83,23 +76,19 @@ public void TeleportArm(
             float oldElbowOrientation = elbowManip.transform.localEulerAngles.z;
 
             // establish defaults in the absence of inputs
-            if (position == null)
-            {
+            if (position == null) {
                 position = new Vector3(0f, 0f, 0.4f);
             }
 
-            if (rotation == null)
-            {
+            if (rotation == null) {
                 rotation = new Vector4(1f, 0f, 0f, 0f);
             }
 
-            if (armHeight == null)
-            {
+            if (armHeight == null) {
                 armHeight = -0.003f;
             }
 
-            if (elbowOrientation == null)
-            {
+            if (elbowOrientation == null) {
                 elbowOrientation = 0f;
             }
 
@@ -111,16 +100,13 @@ public void TeleportArm(
             );
 
             // teleport arm-elements
-            if (!worldRelative)
-            {
+            if (!worldRelative) {
                 posRotManip.transform.localPosition = (Vector3)position;
                 posRotManip.transform.localRotation = Quaternion.AngleAxis(
                     ((Vector4)rotation).w % 360,
                     new Vector3(((Vector4)rotation).x, ((Vector4)rotation).y, ((Vector4)rotation).z)
                 );
-            }
-            else
-            {
+            } else {
                 posRotManip.transform.position = (Vector3)position;
                 posRotManip.transform.rotation = Quaternion.AngleAxis(
                     ((Vector4)rotation).w % 360,
@@ -134,8 +120,7 @@ public void TeleportArm(
                 (float)elbowOrientation
             );
 
-            if (Arm.IsArmColliding() && !forceAction)
-            {
+            if (Arm.IsArmColliding() && !forceAction) {
                 errorMessage = "collision detected at desired transform, cannot teleport";
                 heightManip.transform.localPosition = new Vector3(
                     heightManip.transform.localPosition.x,
@@ -153,9 +138,7 @@ public void TeleportArm(
                     oldElbowOrientation
                 );
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 actionFinished(true);
             }
         }
@@ -180,12 +163,10 @@ public void RotateWristAroundHeldObject(
             float roll = 0f,
             float speed = 10f,
             bool returnToStart = true
-        )
-        {
+        ) {
             var arm = getArm();
 
-            if (arm.heldObjects.Count == 1)
-            {
+            if (arm.heldObjects.Count == 1) {
                 SimObjPhysics sop = arm.heldObjects.Keys.ToArray()[0];
                 RotateWristAroundPoint(
                     point: sop.gameObject.transform.position,
@@ -195,9 +176,7 @@ public void RotateWristAroundHeldObject(
                     speed: speed,
                     returnToStart: returnToStart
                 );
-            }
-            else
-            {
+            } else {
                 actionFinished(
                     success: false,
                     errorMessage: $"Cannot RotateWristAroundHeldObject when holding"
@@ -218,8 +197,7 @@ public void RotateWristAroundPoint(
             float roll = 0f,
             float speed = 10f,
             bool returnToStart = true
-        )
-        {
+        ) {
             IK_Robot_Arm_Controller arm = getArmImplementation();
 
             arm.rotateWristAroundPoint(
@@ -242,8 +220,7 @@ to prevent self-collisions. In particular we need to
         account for the hierarchy of rigidbodies of each arm joint and
         determine how to detect collision between a given arm joint and other arm joints.
         */
-        public void RotateElbowRelative(float degrees, float speed = 10f, bool returnToStart = true)
-        {
+        public void RotateElbowRelative(float degrees, float speed = 10f, bool returnToStart = true) {
             IK_Robot_Arm_Controller arm = getArmImplementation();
 
             arm.rotateElbowRelative(
@@ -258,8 +235,7 @@ public void RotateElbowRelative(float degrees, float speed = 10f, bool returnToS
         /*
         Same as RotateElbowRelative but rotates the elbow to a given angle directly.
         */
-        public void RotateElbow(float degrees, float speed = 10f, bool returnToStart = true)
-        {
+        public void RotateElbow(float degrees, float speed = 10f, bool returnToStart = true) {
             IK_Robot_Arm_Controller arm = getArmImplementation();
 
             arm.rotateElbow(
diff --git a/unity/Assets/Scripts/Lamp.cs b/unity/Assets/Scripts/Lamp.cs
index 469b412d8c..929b3270d5 100644
--- a/unity/Assets/Scripts/Lamp.cs
+++ b/unity/Assets/Scripts/Lamp.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Lamp : MonoBehaviour
-{
+public class Lamp : MonoBehaviour {
     public SimObj ParentObj;
     public bool EditorOn = false;
     public bool OnByDefault = true;
@@ -14,38 +13,29 @@ public class Lamp : MonoBehaviour
     public Material OffMaterial;
     public Light[] Lights;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
             }
-        }
-        else
-        {
-            if (OnByDefault)
-            {
+        } else {
+            if (OnByDefault) {
                 ParentObj.Animator.SetBool("AnimState1", true);
             }
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool on = EditorOn;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             on = ParentObj.Animator.GetBool("AnimState1");
         }
 
@@ -55,8 +45,7 @@ void Update()
             || OnMaterial == null
             || OffMaterial == null
             || Lights.Length == 0
-        )
-        {
+        ) {
             Debug.LogError("Required item null in lamp " + name);
             return;
         }
@@ -64,8 +53,7 @@ void Update()
         Material[] sharedMats = LampshadeRenderer.sharedMaterials;
         sharedMats[LampshadeMatIndex] = on ? OnMaterial : OffMaterial;
         LampshadeRenderer.sharedMaterials = sharedMats;
-        foreach (Light l in Lights)
-        {
+        foreach (Light l in Lights) {
             l.enabled = on;
         }
     }
diff --git a/unity/Assets/Scripts/Laptop.cs b/unity/Assets/Scripts/Laptop.cs
index 6e0cd7d868..4d30401009 100644
--- a/unity/Assets/Scripts/Laptop.cs
+++ b/unity/Assets/Scripts/Laptop.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Laptop : MonoBehaviour
-{
+public class Laptop : MonoBehaviour {
     public SimObj SimObjParent;
     public Transform[] PivotTransforms;
     public Renderer[] ScreenRenderers;
@@ -25,32 +24,24 @@ public class Laptop : MonoBehaviour
 
     bool displayedError;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         Television = GameObject.FindObjectOfType<Television>();
     }
 
-    void Update()
-    {
-        if (Television != null)
-        {
+    void Update() {
+        if (Television != null) {
             Television.SyncedScreenMat = OnScreenMat;
         }
 
         Vector3 rot = ClosedRot;
         Material mat = OffScreenMat;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             rot = EditorOpen ? OpenRot : ClosedRot;
             mat = EditorOn ? OnScreenMat : OffScreenMat;
-        }
-        else
-        {
-            if (SimObjParent == null || OffScreenMat == null || OnScreenMat == null)
-            {
-                if (!displayedError)
-                {
+        } else {
+            if (SimObjParent == null || OffScreenMat == null || OnScreenMat == null) {
+                if (!displayedError) {
                     Debug.LogError("Component null in latop " + name);
                     displayedError = true;
                 }
@@ -62,8 +53,7 @@ void Update()
             // 2 - Open, Off
             // 3 - Closed, On
 
-            switch (animState)
-            {
+            switch (animState) {
                 case 1:
                 default:
                     rot = ClosedRot;
@@ -82,8 +72,7 @@ void Update()
             }
         }
 
-        for (int i = 0; i < ScreenRenderers.Length; i++)
-        {
+        for (int i = 0; i < ScreenRenderers.Length; i++) {
             Material[] sharedMats = ScreenRenderers[i].sharedMaterials;
             sharedMats[ScreenMatIndexes[i]] = mat;
             ScreenRenderers[i].sharedMaterials = sharedMats;
diff --git a/unity/Assets/Scripts/LightSwitch.cs b/unity/Assets/Scripts/LightSwitch.cs
index fad8d098ab..5933a1e353 100644
--- a/unity/Assets/Scripts/LightSwitch.cs
+++ b/unity/Assets/Scripts/LightSwitch.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class LightSwitch : MonoBehaviour
-{
+public class LightSwitch : MonoBehaviour {
     public SimObj ParentObj;
     public bool OnByDefault = true;
     public bool EditorOn = false;
@@ -17,54 +16,43 @@ public class LightSwitch : MonoBehaviour
     Color groundColor;
     Color skyColor;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         equatorColor = RenderSettings.ambientEquatorColor;
         groundColor = RenderSettings.ambientGroundColor;
         skyColor = RenderSettings.ambientSkyColor;
 
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
             }
-        }
-        else
-        {
-            if (OnByDefault)
-            {
+        } else {
+            if (OnByDefault) {
                 ParentObj.Animator.SetBool("AnimState1", true);
             }
         }
     }
 
-    void Update()
-    {
+    void Update() {
         // print(SourceRenderers.Length);
 
         bool on = EditorOn;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             on = ParentObj.Animator.GetBool("AnimState1");
         }
 
-        for (int i = 0; i < Lights.Length; i++)
-        {
+        for (int i = 0; i < Lights.Length; i++) {
             Lights[i].enabled = on;
         }
 
-        for (int i = 0; i < SourceRenderers.Length; i++)
-        {
+        for (int i = 0; i < SourceRenderers.Length; i++) {
             //  print(i);
             Material[] sharedMats = SourceRenderers[i].sharedMaterials;
             sharedMats[SourceMatIndexes[i]] = on ? OnMaterial : OffMaterial;
diff --git a/unity/Assets/Scripts/ListExtensions.cs b/unity/Assets/Scripts/ListExtensions.cs
index aa07b2ae55..f0b95d93f9 100644
--- a/unity/Assets/Scripts/ListExtensions.cs
+++ b/unity/Assets/Scripts/ListExtensions.cs
@@ -26,18 +26,14 @@
 using System.Linq;
 using UnityEngine;
 
-public static class ListExtensions
-{
-    public static IList<T> Shuffle<T>(this IList<T> list)
-    {
+public static class ListExtensions {
+    public static IList<T> Shuffle<T>(this IList<T> list) {
         return list.ShallowCopy().Shuffle_();
     }
 
-    public static IList<T> Shuffle_<T>(this IList<T> list)
-    {
+    public static IList<T> Shuffle_<T>(this IList<T> list) {
         int n = list.Count;
-        while (n > 1)
-        {
+        while (n > 1) {
             n--;
             int k = UnityEngine.Random.Range(0, n + 1);
             T value = list[k];
@@ -47,17 +43,14 @@ public static IList<T> Shuffle_<T>(this IList<T> list)
         return list;
     }
 
-    public static IList<T> Shuffle_<T>(this IList<T> list, int seed)
-    {
+    public static IList<T> Shuffle_<T>(this IList<T> list, int seed) {
         // NOTE: this doesn't use systemRandom
         return list.Shuffle_(new System.Random(seed));
     }
 
-    public static IList<T> Shuffle_<T>(this IList<T> list, System.Random rng)
-    {
+    public static IList<T> Shuffle_<T>(this IList<T> list, System.Random rng) {
         int n = list.Count;
-        while (n > 1)
-        {
+        while (n > 1) {
             n--;
             int k = rng.Next(n + 1);
             T value = list[k];
@@ -67,8 +60,7 @@ public static IList<T> Shuffle_<T>(this IList<T> list, System.Random rng)
         return list;
     }
 
-    public static IList<T> ShallowCopy<T>(this IList<T> listToCopy)
-    {
+    public static IList<T> ShallowCopy<T>(this IList<T> listToCopy) {
         return listToCopy.Select(item => item).ToList();
     }
 }
diff --git a/unity/Assets/Scripts/LocobotFPSAgentController.cs b/unity/Assets/Scripts/LocobotFPSAgentController.cs
index 32860a5e3d..4d0048b96d 100644
--- a/unity/Assets/Scripts/LocobotFPSAgentController.cs
+++ b/unity/Assets/Scripts/LocobotFPSAgentController.cs
@@ -13,10 +13,8 @@
 using UnityStandardAssets.ImageEffects;
 using UnityStandardAssets.Utility;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class LocobotFPSAgentController : BaseFPSAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class LocobotFPSAgentController : BaseFPSAgentController {
         protected bool applyActionNoise = true;
         protected float movementGaussianMu = 0.001f;
         protected float movementGaussianSigma = 0.005f;
@@ -30,8 +28,7 @@ AgentManager agentManager
         )
             : base(baseAgentComponent, agentManager) { }
 
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             // toggle FirstPersonCharacterCull
 
             VisibilityCapsule = BotVisCap;
@@ -59,47 +56,36 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
                 m_Camera.transform.localPosition + new Vector3(0, -0.2206f, 0); // smaller y offset if Bot
 
             // limit camera from looking too far down/up
-            if (Mathf.Approximately(initializeAction.maxUpwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(initializeAction.maxUpwardLookAngle, 0.0f)) {
                 this.maxUpwardLookAngle = 30f;
-            }
-            else
-            {
+            } else {
                 this.maxUpwardLookAngle = initializeAction.maxUpwardLookAngle;
             }
 
-            if (Mathf.Approximately(initializeAction.maxDownwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(initializeAction.maxDownwardLookAngle, 0.0f)) {
                 this.maxDownwardLookAngle = 30f;
-            }
-            else
-            {
+            } else {
                 this.maxDownwardLookAngle = initializeAction.maxDownwardLookAngle;
             }
             return ActionFinished.Success;
         }
 
-        public new void Initialize(ServerAction action)
-        {
+        public new void Initialize(ServerAction action) {
             this.applyActionNoise = action.applyActionNoise;
 
-            if (action.movementGaussianMu > 0.0f)
-            {
+            if (action.movementGaussianMu > 0.0f) {
                 this.movementGaussianMu = action.movementGaussianMu;
             }
 
-            if (action.movementGaussianSigma > 0.0f)
-            {
+            if (action.movementGaussianSigma > 0.0f) {
                 this.movementGaussianSigma = action.movementGaussianSigma;
             }
 
-            if (action.rotateGaussianMu > 0.0f)
-            {
+            if (action.rotateGaussianMu > 0.0f) {
                 this.rotateGaussianMu = action.rotateGaussianMu;
             }
 
-            if (action.rotateGaussianSigma > 0.0f)
-            {
+            if (action.rotateGaussianSigma > 0.0f) {
                 this.rotateGaussianSigma = action.rotateGaussianSigma;
             }
 
@@ -117,8 +103,7 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             if (
                 UnityEngine.SceneManagement.SceneManager.GetActiveScene().name
                 == "FloorPlan_Train_Generated"
-            )
-            {
+            ) {
                 GenerateRoboTHOR colorChangeComponent =
                     physicsSceneManager.GetComponent<GenerateRoboTHOR>();
                 colorChangeComponent.GenerateConfig(agentTransform: transform);
@@ -126,8 +111,7 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
         }
 
         // reset visible objects while in editor, for debug purposes only
-        private void LateUpdate()
-        {
+        private void LateUpdate() {
 #if UNITY_EDITOR || UNITY_WEBGL
             VisibleSimObjPhysics = VisibleSimObjs();
 #endif
@@ -139,19 +123,14 @@ public void MoveRelative(
             float z = 0f,
             float noise = 0f,
             bool forceAction = false
-        )
-        {
-            if (!moveMagnitude.HasValue)
-            {
+        ) {
+            if (!moveMagnitude.HasValue) {
                 moveMagnitude = gridSize;
-            }
-            else if (moveMagnitude.Value <= 0f)
-            {
+            } else if (moveMagnitude.Value <= 0f) {
                 throw new InvalidOperationException("moveMagnitude must be null or >= 0.");
             }
 
-            if (!allowHorizontalMovement && Math.Abs(x) > 0)
-            {
+            if (!allowHorizontalMovement && Math.Abs(x) > 0) {
                 throw new InvalidOperationException(
                     "Controller does not support horizontal movement. Set AllowHorizontalMovement to true on the Controller."
                 );
@@ -159,11 +138,9 @@ public void MoveRelative(
 
             var moveLocal = new Vector3(x, 0, z);
             float xzMag = moveLocal.magnitude;
-            if (xzMag > 1e-5f)
-            {
+            if (xzMag > 1e-5f) {
                 // rotate a small amount with every movement since robot doesn't always move perfectly straight
-                if (this.applyActionNoise)
-                {
+                if (this.applyActionNoise) {
                     var rotateNoise = (float)
                         systemRandom.NextGaussian(rotateGaussianMu, rotateGaussianSigma / 2.0f);
                     transform.rotation =
@@ -182,30 +159,23 @@ public void MoveRelative(
                         forceAction: forceAction
                     )
                 );
-            }
-            else
-            {
+            } else {
                 errorMessage = "either x or z must be != 0 for the MoveRelative action";
                 actionFinished(false);
             }
         }
 
         // NOOP action to allow evaluation to know that the episode has finished
-        public void Stop()
-        {
+        public void Stop() {
             // i don't know why, but we have two no-op actions so here we go
             base.Pass();
         }
 
-        public override void LookDown(ServerAction action)
-        {
+        public override void LookDown(ServerAction action) {
             // default degree increment to 30
-            if (action.degrees == 0)
-            {
+            if (action.degrees == 0) {
                 action.degrees = 30f;
-            }
-            else
-            {
+            } else {
                 errorMessage = "Must have degrees == 0 for now.";
                 actionFinished(false);
                 return;
@@ -215,8 +185,7 @@ public override void LookDown(ServerAction action)
             // this is to prevent too small of a degree increment change that could cause float imprecision
             action.degrees = Mathf.Round(action.degrees * 10.0f) / 10.0f;
 
-            if (!checkForUpDownAngleLimit("down", action.degrees))
-            {
+            if (!checkForUpDownAngleLimit("down", action.degrees)) {
                 errorMessage =
                     "can't look down beyond "
                     + maxDownwardLookAngle
@@ -230,15 +199,11 @@ public override void LookDown(ServerAction action)
             return;
         }
 
-        public override void LookUp(ServerAction action)
-        {
+        public override void LookUp(ServerAction action) {
             // default degree increment to 30
-            if (action.degrees == 0)
-            {
+            if (action.degrees == 0) {
                 action.degrees = 30f;
-            }
-            else
-            {
+            } else {
                 errorMessage = "Must have degrees == 0 for now.";
                 actionFinished(false);
                 return;
@@ -248,8 +213,7 @@ public override void LookUp(ServerAction action)
             // this is to prevent too small of a degree increment change that could cause float imprecision
             action.degrees = Mathf.Round(action.degrees * 10.0f) / 10.0f;
 
-            if (!checkForUpDownAngleLimit("up", action.degrees))
-            {
+            if (!checkForUpDownAngleLimit("up", action.degrees)) {
                 errorMessage =
                     "can't look up beyond "
                     + maxUpwardLookAngle
@@ -263,16 +227,13 @@ public override void LookUp(ServerAction action)
         }
 
         // NOTE: This is necessary to avoid an ambiguous action between base and stochastic.
-        public void Rotate(Vector3 rotation)
-        {
+        public void Rotate(Vector3 rotation) {
             Rotate(rotation: rotation, noise: 0);
         }
 
-        public void Rotate(Vector3 rotation, float noise, bool manualInteract = false)
-        {
+        public void Rotate(Vector3 rotation, float noise, bool manualInteract = false) {
             // only default hand if not manually Interacting with things
-            if (!manualInteract)
-            {
+            if (!manualInteract) {
                 DefaultAgentHand();
             }
 
@@ -288,24 +249,20 @@ public void Rotate(Vector3 rotation, float noise, bool manualInteract = false)
             actionFinished(true);
         }
 
-        public void RotateRight(ServerAction action)
-        {
+        public void RotateRight(ServerAction action) {
             float rotationAmount = this.rotateStepDegrees;
 
-            if (action.degrees != 0.0f)
-            {
+            if (action.degrees != 0.0f) {
                 rotationAmount = action.degrees;
             }
 
             Rotate(rotation: new Vector3(0, rotationAmount, 0));
         }
 
-        public void RotateLeft(ServerAction action)
-        {
+        public void RotateLeft(ServerAction action) {
             float rotationAmount = this.rotateStepDegrees;
 
-            if (action.degrees != 0.0f)
-            {
+            if (action.degrees != 0.0f) {
                 rotationAmount = action.degrees;
             }
 
@@ -327,8 +284,7 @@ public void Teleport(
             Vector3? rotation = null,
             float? horizon = null,
             bool forceAction = false
-        )
-        {
+        ) {
             Teleport(
                 position: new Vector3(x, y, z),
                 rotation: rotation,
@@ -342,8 +298,7 @@ public void Teleport(
             Vector3? rotation = null,
             float? horizon = null,
             bool forceAction = false
-        )
-        {
+        ) {
             base.teleport(
                 position: position,
                 rotation: rotation,
@@ -369,8 +324,7 @@ public void TeleportFull(
             Vector3? rotation,
             float? horizon,
             bool forceAction = false
-        )
-        {
+        ) {
             TeleportFull(
                 position: new Vector3(x, y, z),
                 rotation: rotation,
@@ -384,8 +338,7 @@ public void TeleportFull(
             Vector3? rotation,
             float? horizon,
             bool forceAction = false
-        )
-        {
+        ) {
             base.teleportFull(
                 position: position,
                 rotation: rotation,
@@ -400,8 +353,7 @@ public void MoveAhead(
             float? moveMagnitude = null,
             float noise = 0f,
             bool forceAction = false
-        )
-        {
+        ) {
             MoveRelative(
                 z: 1.0f,
                 moveMagnitude: moveMagnitude,
@@ -414,8 +366,7 @@ public void MoveBack(
             float? moveMagnitude = null,
             float noise = 0f,
             bool forceAction = false
-        )
-        {
+        ) {
             MoveRelative(
                 z: -1.0f,
                 moveMagnitude: moveMagnitude,
@@ -428,10 +379,8 @@ public void MoveRight(
             float? moveMagnitude = null,
             float noise = 0f,
             bool forceAction = false
-        )
-        {
-            if (!allowHorizontalMovement)
-            {
+        ) {
+            if (!allowHorizontalMovement) {
                 throw new InvalidOperationException(
                     "Controller does not support horizontal movement by default. Set AllowHorizontalMovement to true on the Controller."
                 );
@@ -448,10 +397,8 @@ public void MoveLeft(
             float? moveMagnitude = null,
             float noise = 0f,
             bool forceAction = false
-        )
-        {
-            if (!allowHorizontalMovement)
-            {
+        ) {
+            if (!allowHorizontalMovement) {
                 throw new InvalidOperationException(
                     "Controller does not support horizontal movement by default. Set AllowHorizontalMovement to true on the Controller."
                 );
@@ -464,16 +411,14 @@ public void MoveLeft(
             );
         }
 
-        protected float GetMoveMagnitudeWithNoise(float moveMagnitude, float noise)
-        {
+        protected float GetMoveMagnitudeWithNoise(float moveMagnitude, float noise) {
             float internalNoise = applyActionNoise
                 ? (float)systemRandom.NextGaussian(movementGaussianMu, movementGaussianSigma)
                 : 0;
             return moveMagnitude + noise + (float)internalNoise;
         }
 
-        protected float GetRotateMagnitudeWithNoise(Vector3 rotation, float noise)
-        {
+        protected float GetRotateMagnitudeWithNoise(Vector3 rotation, float noise) {
             float internalNoise = applyActionNoise
                 ? (float)systemRandom.NextGaussian(rotateGaussianMu, rotateGaussianSigma)
                 : 0;
diff --git a/unity/Assets/Scripts/Microwave.cs b/unity/Assets/Scripts/Microwave.cs
index 1677ad3427..faca2ad2f9 100644
--- a/unity/Assets/Scripts/Microwave.cs
+++ b/unity/Assets/Scripts/Microwave.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 //[ExecuteInEditMode]
-public class Microwave : MonoBehaviour
-{
+public class Microwave : MonoBehaviour {
     public Transform Door;
     public Vector3 DoorOpenRot;
     public Vector3 DoorClosedRot;
@@ -21,21 +20,15 @@ public class Microwave : MonoBehaviour
 
     bool displayedError = false;
 
-    public void Update()
-    {
-        if (!Application.isPlaying)
-        {
+    public void Update() {
+        if (!Application.isPlaying) {
             Door.localEulerAngles = EditorOpen ? DoorOpenRot : DoorClosedRot;
             Material[] sharedMats = GlassRenderer.sharedMaterials;
             sharedMats[MatIndex] = EditorOn ? OnGlassMat : OffGlassMat;
             GlassRenderer.sharedMaterials = sharedMats;
-        }
-        else
-        {
-            if (SimObjParent == null || GlassRenderer == null || Door == null)
-            {
-                if (!displayedError)
-                {
+        } else {
+            if (SimObjParent == null || GlassRenderer == null || Door == null) {
+                if (!displayedError) {
                     Debug.LogError("Component null in microwave " + name);
                     displayedError = true;
                 }
@@ -48,8 +41,7 @@ public void Update()
             // 3 - Closed, On
             Material[] sharedMats = GlassRenderer.sharedMaterials;
             bool waitForDoorToClose = false;
-            switch (animState)
-            {
+            switch (animState) {
                 case 1:
                 default:
                     targetDoorRotation = DoorClosedRot;
@@ -68,8 +60,7 @@ public void Update()
                     break;
             }
 
-            switch (SceneManager.Current.AnimationMode)
-            {
+            switch (SceneManager.Current.AnimationMode) {
                 case SceneAnimationMode.Smooth:
                     Quaternion doorStartRotation = Quaternion.identity;
 
@@ -88,13 +79,11 @@ public void Update()
                         Door.localEulerAngles,
                         targetDoorRotation
                     );
-                    if (distanceToTarget >= 360f)
-                    {
+                    if (distanceToTarget >= 360f) {
                         distanceToTarget -= 360f;
                     }
 
-                    if (!waitForDoorToClose || distanceToTarget < 0.005f)
-                    {
+                    if (!waitForDoorToClose || distanceToTarget < 0.005f) {
                         GlassRenderer.sharedMaterials = sharedMats;
                     }
 
diff --git a/unity/Assets/Scripts/MinimalFPSController.cs b/unity/Assets/Scripts/MinimalFPSController.cs
index f4e3fa5d49..d074dc0a22 100644
--- a/unity/Assets/Scripts/MinimalFPSController.cs
+++ b/unity/Assets/Scripts/MinimalFPSController.cs
@@ -12,20 +12,16 @@
 using UnityStandardAssets.Utility;
 using Random = UnityEngine.Random;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [RequireComponent(typeof(CharacterController))]
-    public class MinimalFPSController : DebugFPSAgentController
-    {
+    public class MinimalFPSController : DebugFPSAgentController {
         private GameObject BackgroundUI;
         private GameObject Crosshair;
         private GameObject TargetText;
         private GameObject ThrowForceBar;
 
-        MinimalFPSController()
-        {
-            this.m_MouseLook = new MouseLook
-            {
+        MinimalFPSController() {
+            this.m_MouseLook = new MouseLook {
                 XSensitivity = 2,
                 YSensitivity = 2,
                 clampVerticalRotation = true,
@@ -41,11 +37,9 @@ public class MinimalFPSController : DebugFPSAgentController
             this.enableHighlightShader = false;
         }
 
-        public new void HideHUD()
-        {
+        public new void HideHUD() {
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
-            if (InputMode_Text != null)
-            {
+            if (InputMode_Text != null) {
                 InputMode_Text.SetActive(false);
             }
             // InputFieldObj.SetActive(false);
@@ -65,18 +59,14 @@ public class MinimalFPSController : DebugFPSAgentController
             TargetText.GetComponent<Text>().enabled = false;
         }
 
-        public void ShowHUD()
-        {
-            if (InputMode_Text != null)
-            {
+        public void ShowHUD() {
+            if (InputMode_Text != null) {
                 InputMode_Text.SetActive(true);
             }
-            if (InputFieldObj != null)
-            {
+            if (InputFieldObj != null) {
                 InputFieldObj.SetActive(true);
             }
-            if (BackgroundUI != null)
-            {
+            if (BackgroundUI != null) {
                 BackgroundUI.SetActive(true);
             }
 
@@ -88,16 +78,14 @@ public void ShowHUD()
             TargetText.GetComponent<Text>().enabled = true;
         }
 
-        public new void OnEnable()
-        {
+        public new void OnEnable() {
             FPSEnabled = true;
             Cursor.visible = false;
             Cursor.lockState = CursorLockMode.Locked;
 
             InputMode_Text = GameObject.Find("DebugCanvasPhysics/InputModeText");
             InputFieldObj = GameObject.Find("DebugCanvasPhysics/InputField");
-            if (InputMode_Text)
-            {
+            if (InputMode_Text) {
                 InputMode_Text.GetComponent<Text>().text = "FPS Mode";
             }
 
@@ -107,21 +95,18 @@ public void ShowHUD()
             HideHUD();
         }
 
-        public new void OnDisable()
-        {
+        public new void OnDisable() {
             DisableMouseControl();
             ShowHUD();
         }
 
-        public new void EnableMouseControl()
-        {
+        public new void EnableMouseControl() {
             FPSEnabled = true;
             Cursor.visible = false;
             Cursor.lockState = CursorLockMode.Locked;
         }
 
-        public new void DisableMouseControl()
-        {
+        public new void DisableMouseControl() {
             Debug.Log("Disabled mouse");
             FPSEnabled = false;
             Cursor.visible = true;
diff --git a/unity/Assets/Scripts/Mirror.cs b/unity/Assets/Scripts/Mirror.cs
index aef9fa2ac7..8359d471c0 100644
--- a/unity/Assets/Scripts/Mirror.cs
+++ b/unity/Assets/Scripts/Mirror.cs
@@ -3,26 +3,21 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Mirror : MonoBehaviour
-{
+public class Mirror : MonoBehaviour {
     public SimObj ParentObj;
     public bool EditorDirty = false;
     public GameObject DirtObject;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentObj = gameObject.GetComponent<SimObj>();
-        if (ParentObj == null)
-        {
+        if (ParentObj == null) {
             ParentObj = gameObject.AddComponent<SimObj>();
         }
         ParentObj.Type = SimObjType.Mirror;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
@@ -30,16 +25,13 @@ void OnEnable()
         }
     }
 
-    void Update()
-    {
+    void Update() {
         bool dirty = EditorDirty;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             dirty = !ParentObj.Animator.GetBool("AnimState1");
         }
 
-        if (DirtObject == null)
-        {
+        if (DirtObject == null) {
             Debug.LogError("Dirt object is null in mirror");
             return;
         }
diff --git a/unity/Assets/Scripts/NavMeshSetup.cs b/unity/Assets/Scripts/NavMeshSetup.cs
index 1b2663af8d..ccb4baf4a0 100644
--- a/unity/Assets/Scripts/NavMeshSetup.cs
+++ b/unity/Assets/Scripts/NavMeshSetup.cs
@@ -9,8 +9,7 @@
 using UnityEditor;
 #endif
 
-public class NavMeshSetup : MonoBehaviour
-{
+public class NavMeshSetup : MonoBehaviour {
     public Transform goal;
     private UnityEngine.AI.NavMeshAgent navMeshAgent;
     private Transform hitPos;
@@ -22,26 +21,22 @@ void Start() { }
 #if UNITY_EDITOR
 
     [UnityEditor.MenuItem("NavMesh/Save Full Scene Prefabs (all houdini scenes)")]
-    public static void SaveHoudiniScenePrefabs()
-    {
+    public static void SaveHoudiniScenePrefabs() {
         var trainSceneNames = houdiniScenes();
 
         // These scenes were mannually adjusted so the nav mesh variables should not be set automatically and should be build manually
         trainSceneNames.ForEach((x) => saveSceneAsPrefab(x));
     }
 
-    private static void saveSceneAsPrefab(string sceneName)
-    {
+    private static void saveSceneAsPrefab(string sceneName) {
         EditorSceneManager.OpenScene(sceneName);
         GameObject sceneParent = new GameObject();
         sceneParent.name = "Scene";
-        foreach (GameObject obj in Object.FindObjectsOfType(typeof(GameObject)))
-        {
+        foreach (GameObject obj in Object.FindObjectsOfType(typeof(GameObject))) {
             if (
                 obj.transform.parent == null
                 && (obj.name == "Objects" || obj.name == "Structure" || obj.name == "Lighting")
-            )
-            {
+            ) {
                 // create new object then destroy it
                 GameObject copyObj = Instantiate(obj) as GameObject;
                 copyObj.transform.parent = sceneParent.transform;
@@ -61,8 +56,7 @@ private static void saveSceneAsPrefab(string sceneName)
         DestroyImmediate(sceneParent);
     }
 
-    private static List<string> houdiniScenes(string pathPrefix = "Assets/Scenes")
-    {
+    private static List<string> houdiniScenes(string pathPrefix = "Assets/Scenes") {
         // list hand chosen from Winson
         // gets iTHOR scene names
         var scenes = new List<string>();
@@ -106,8 +100,7 @@ private static List<string> houdiniScenes(string pathPrefix = "Assets/Scenes")
     }
 
     [UnityEditor.MenuItem("NavMesh/Build NavMeshes for All Scenes")]
-    public static void Build()
-    {
+    public static void Build() {
         // var testSceneNames = GetRoboSceneNames(3, 5, "Val");
         // var trainSceneNames = GetRoboSceneNames(12, 5, "Train");
 
@@ -136,8 +129,7 @@ public static void Build()
     }
 
     [UnityEditor.MenuItem("NavMesh/Build NavMesh for Active Scene")]
-    public static void BuildForCurrentActiveScene()
-    {
+    public static void BuildForCurrentActiveScene() {
         BuildNavmeshForScene(EditorSceneManager.GetActiveScene().path);
     }
 
@@ -146,13 +138,10 @@ private static List<string> GetRoboSceneNames(
         int lastSubIndex,
         string nameTemplate,
         string pathPrefix = "Assets/Scenes"
-    )
-    {
+    ) {
         var scenes = new List<string>();
-        for (var i = 1; i <= lastIndex; i++)
-        {
-            for (var j = 1; j <= lastSubIndex; j++)
-            {
+        for (var i = 1; i <= lastIndex; i++) {
+            for (var j = 1; j <= lastSubIndex; j++) {
                 var scene = pathPrefix + "/FloorPlan_" + nameTemplate + i + "_" + j + ".unity";
                 scenes.Add(scene);
             }
@@ -165,29 +154,24 @@ private static List<string> GetSceneNames(
         int lastIndex,
         string nameTemplate = "",
         string pathPrefix = "Assets/Scenes"
-    )
-    {
+    ) {
         var scenes = new List<string>();
-        for (var i = startIndex; i <= lastIndex; i++)
-        {
+        for (var i = startIndex; i <= lastIndex; i++) {
             var scene = pathPrefix + "/FloorPlan" + nameTemplate + i + "_physics.unity";
             scenes.Add(scene);
         }
         return scenes;
     }
 
-    private static void BuildNavMeshesForScenes(IEnumerable<string> sceneNames)
-    {
-        foreach (var sceneName in sceneNames)
-        {
+    private static void BuildNavMeshesForScenes(IEnumerable<string> sceneNames) {
+        foreach (var sceneName in sceneNames) {
             EditorSceneManager.OpenScene(sceneName);
             GameObject.Find("DebugCanvasPhysics/Object");
             // FindObjectsOfType<MeshRenderer>()
         }
     }
 
-    private static void BuildNavmeshForScene(string sceneName)
-    {
+    private static void BuildNavmeshForScene(string sceneName) {
         //EditorSceneManager.OpenScene(sceneName);
         SetNavMeshNotWalkable(GameObject.Find("Objects"));
         SetNavMeshNotWalkable(GameObject.Find("Structure"));
@@ -205,8 +189,7 @@ private static void BuildNavmeshForScene(string sceneName)
         navmeshAgent.enabled = true;
         // The Editor bake interface does not take with parameters and could not be modified as of 2018.3
         //var buildSettings =
-        new NavMeshBuildSettings()
-        {
+        new NavMeshBuildSettings() {
             agentTypeID = navmeshAgent.agentTypeID,
             agentRadius = 0.2f,
             agentHeight = 1.8f,
@@ -221,16 +204,13 @@ private static void BuildNavmeshForScene(string sceneName)
         EditorSceneManager.SaveScene(EditorSceneManager.GetActiveScene());
     }
 
-    public static void SetNavMeshNotWalkable(GameObject hierarchy)
-    {
-        for (int i = 0; i < hierarchy.transform.childCount; i++)
-        {
+    public static void SetNavMeshNotWalkable(GameObject hierarchy) {
+        for (int i = 0; i < hierarchy.transform.childCount; i++) {
             var child = hierarchy.transform.GetChild(i);
             child
                 .GetComponentsInChildren<MeshRenderer>()
                 .ToList()
-                .ForEach(meshRenderer =>
-                {
+                .ForEach(meshRenderer => {
                     Debug.Log("Mesh Renderer " + meshRenderer.gameObject.name + " layer ");
                     UnityEditor.GameObjectUtility.SetStaticEditorFlags(
                         meshRenderer.gameObject,
@@ -245,14 +225,12 @@ public static void SetNavMeshNotWalkable(GameObject hierarchy)
         }
     }
 
-    public static void SetNavMeshWalkable(GameObject hierarchy)
-    {
+    public static void SetNavMeshWalkable(GameObject hierarchy) {
         //  var objectHierarchy = hirerarchy.transform.FirstChildOrDefault(x => x.name.Contains("Floor"));
         hierarchy
             .GetComponentsInChildren<MeshRenderer>()
             .ToList()
-            .ForEach(meshRenderer =>
-            {
+            .ForEach(meshRenderer => {
                 Debug.Log("Mesh Renderer " + meshRenderer.gameObject.name + " layer ");
                 UnityEditor.GameObjectUtility.SetStaticEditorFlags(
                     meshRenderer.gameObject,
@@ -265,17 +243,14 @@ public static void SetNavMeshWalkable(GameObject hierarchy)
             });
     }
 
-    private static GameObject SearchForSimObjectType(SimObjType sot, GameObject hierarchy)
-    {
+    private static GameObject SearchForSimObjectType(SimObjType sot, GameObject hierarchy) {
         GameObject go = null;
 
         hierarchy
             .GetComponentsInChildren<SimObjPhysics>()
             .ToList()
-            .ForEach(sop =>
-            {
-                if (sop.ObjType == sot)
-                {
+            .ForEach(sop => {
+                if (sop.ObjType == sot) {
                     go = sop.gameObject;
                 }
             });
diff --git a/unity/Assets/Scripts/NavMeshSurfaceExtended.cs b/unity/Assets/Scripts/NavMeshSurfaceExtended.cs
index d6b779be49..c228c05f24 100644
--- a/unity/Assets/Scripts/NavMeshSurfaceExtended.cs
+++ b/unity/Assets/Scripts/NavMeshSurfaceExtended.cs
@@ -8,8 +8,7 @@
 using UnityEditor.SceneManagement;
 #endif
 
-public class NavMeshSurfaceExtended : NavMeshSurface
-{
+public class NavMeshSurfaceExtended : NavMeshSurface {
     public NavMeshBuildSettings buildSettings { get; private set; }
 
     // static readonly List<NavMeshSurfaceExtended> s_NavMeshSurfaces = new List<NavMeshSurfaceExtended>();
@@ -21,16 +20,14 @@ public class NavMeshSurfaceExtended : NavMeshSurface
     // }
     // Dictionary<int, NavMeshData> navmeshes = new Dictionary<int, NavMeshData>();
 
-    public void BuildNavMesh(NavMeshBuildSettings buildSettings)
-    {
+    public void BuildNavMesh(NavMeshBuildSettings buildSettings) {
         var sources = CollectSources();
         this.buildSettings = buildSettings;
 
         // Use unscaled bounds - this differs in behaviour from e.g. collider components.
         // But is similar to reflection probe - and since navmesh data has no scaling support - it is the right choice here.
         var sourcesBounds = new Bounds(center, Abs(size));
-        if (collectObjects == CollectObjects.All || collectObjects == CollectObjects.Children)
-        {
+        if (collectObjects == CollectObjects.All || collectObjects == CollectObjects.Children) {
             sourcesBounds = CalculateWorldBounds(sources);
         }
 
@@ -42,13 +39,11 @@ public void BuildNavMesh(NavMeshBuildSettings buildSettings)
             transform.rotation
         );
 
-        if (data != null)
-        {
+        if (data != null) {
             data.name = gameObject.name;
             RemoveData();
             navMeshData = data;
-            if (isActiveAndEnabled)
-            {
+            if (isActiveAndEnabled) {
                 AddData();
             }
         }
@@ -83,30 +78,24 @@ public void BuildNavMesh(NavMeshBuildSettings buildSettings)
 
 
 
-    static Vector3 Abs(Vector3 v)
-    {
+    static Vector3 Abs(Vector3 v) {
         return new Vector3(Mathf.Abs(v.x), Mathf.Abs(v.y), Mathf.Abs(v.z));
     }
 
-    Bounds CalculateWorldBounds(List<NavMeshBuildSource> sources)
-    {
+    Bounds CalculateWorldBounds(List<NavMeshBuildSource> sources) {
         // Use the unscaled matrix for the NavMeshSurface
         Matrix4x4 worldToLocal = Matrix4x4.TRS(transform.position, transform.rotation, Vector3.one);
         worldToLocal = worldToLocal.inverse;
 
         var result = new Bounds();
-        foreach (var src in sources)
-        {
-            switch (src.shape)
-            {
-                case NavMeshBuildSourceShape.Mesh:
-                {
-                    var m = src.sourceObject as Mesh;
-                    result.Encapsulate(GetWorldBounds(worldToLocal * src.transform, m.bounds));
-                    break;
-                }
-                case NavMeshBuildSourceShape.Terrain:
-                {
+        foreach (var src in sources) {
+            switch (src.shape) {
+                case NavMeshBuildSourceShape.Mesh: {
+                        var m = src.sourceObject as Mesh;
+                        result.Encapsulate(GetWorldBounds(worldToLocal * src.transform, m.bounds));
+                        break;
+                    }
+                case NavMeshBuildSourceShape.Terrain: {
 #if NMC_CAN_ACCESS_TERRAIN
                     // Terrain pivot is lower/left corner - shift bounds accordingly
                     var t = src.sourceObject as TerrainData;
@@ -117,12 +106,12 @@ Bounds CalculateWorldBounds(List<NavMeshBuildSource> sources)
                         )
                     );
 #else
-                    Debug.LogWarning(
-                        "The NavMesh cannot be properly baked for the terrain because the necessary functionality is missing. Add the com.unity.modules.terrain package through the Package Manager."
-                    );
+                        Debug.LogWarning(
+                            "The NavMesh cannot be properly baked for the terrain because the necessary functionality is missing. Add the com.unity.modules.terrain package through the Package Manager."
+                        );
 #endif
-                    break;
-                }
+                        break;
+                    }
                 case NavMeshBuildSourceShape.Box:
                 case NavMeshBuildSourceShape.Sphere:
                 case NavMeshBuildSourceShape.Capsule:
@@ -141,8 +130,7 @@ Bounds CalculateWorldBounds(List<NavMeshBuildSource> sources)
         return result;
     }
 
-    static Bounds GetWorldBounds(Matrix4x4 mat, Bounds bounds)
-    {
+    static Bounds GetWorldBounds(Matrix4x4 mat, Bounds bounds) {
         var absAxisX = Abs(mat.MultiplyVector(Vector3.right));
         var absAxisY = Abs(mat.MultiplyVector(Vector3.up));
         var absAxisZ = Abs(mat.MultiplyVector(Vector3.forward));
@@ -152,43 +140,34 @@ static Bounds GetWorldBounds(Matrix4x4 mat, Bounds bounds)
         return new Bounds(worldPosition, worldSize);
     }
 
-    void AppendModifierVolumes(ref List<NavMeshBuildSource> sources)
-    {
+    void AppendModifierVolumes(ref List<NavMeshBuildSource> sources) {
 #if UNITY_EDITOR
         var myStage = StageUtility.GetStageHandle(gameObject);
-        if (!myStage.IsValid())
-        {
+        if (!myStage.IsValid()) {
             return;
         }
 #endif
         // Modifiers
         List<NavMeshModifierVolume> modifiers;
-        if (collectObjects == CollectObjects.Children)
-        {
+        if (collectObjects == CollectObjects.Children) {
             modifiers = new List<NavMeshModifierVolume>(
                 GetComponentsInChildren<NavMeshModifierVolume>()
             );
             modifiers.RemoveAll(x => !x.isActiveAndEnabled);
-        }
-        else
-        {
+        } else {
             modifiers = NavMeshModifierVolume.activeModifiers;
         }
 
-        foreach (var m in modifiers)
-        {
-            if ((layerMask & (1 << m.gameObject.layer)) == 0)
-            {
+        foreach (var m in modifiers) {
+            if ((layerMask & (1 << m.gameObject.layer)) == 0) {
                 continue;
             }
 
-            if (!m.AffectsAgentType(agentTypeID))
-            {
+            if (!m.AffectsAgentType(agentTypeID)) {
                 continue;
             }
 #if UNITY_EDITOR
-            if (!myStage.Contains(m.gameObject))
-            {
+            if (!myStage.Contains(m.gameObject)) {
                 continue;
             }
 #endif
@@ -209,31 +188,24 @@ void AppendModifierVolumes(ref List<NavMeshBuildSource> sources)
         }
     }
 
-    public List<NavMeshBuildSource> CollectSources()
-    {
+    public List<NavMeshBuildSource> CollectSources() {
         var sources = new List<NavMeshBuildSource>();
         var markups = new List<NavMeshBuildMarkup>();
 
         List<NavMeshModifier> modifiers;
-        if (collectObjects == CollectObjects.Children)
-        {
+        if (collectObjects == CollectObjects.Children) {
             modifiers = new List<NavMeshModifier>(GetComponentsInChildren<NavMeshModifier>());
             modifiers.RemoveAll(x => !x.isActiveAndEnabled);
-        }
-        else
-        {
+        } else {
             modifiers = NavMeshModifier.activeModifiers;
         }
 
-        foreach (var m in modifiers)
-        {
-            if ((layerMask & (1 << m.gameObject.layer)) == 0)
-            {
+        foreach (var m in modifiers) {
+            if ((layerMask & (1 << m.gameObject.layer)) == 0) {
                 continue;
             }
 
-            if (!m.AffectsAgentType(agentTypeID))
-            {
+            if (!m.AffectsAgentType(agentTypeID)) {
                 continue;
             }
 
@@ -246,10 +218,8 @@ public List<NavMeshBuildSource> CollectSources()
         }
 
 #if UNITY_EDITOR
-        if (!EditorApplication.isPlaying)
-        {
-            if (collectObjects == CollectObjects.All)
-            {
+        if (!EditorApplication.isPlaying) {
+            if (collectObjects == CollectObjects.All) {
                 UnityEditor.AI.NavMeshBuilder.CollectSourcesInStage(
                     null,
                     layerMask,
@@ -259,9 +229,7 @@ public List<NavMeshBuildSource> CollectSources()
                     gameObject.scene,
                     sources
                 );
-            }
-            else if (collectObjects == CollectObjects.Children)
-            {
+            } else if (collectObjects == CollectObjects.Children) {
                 UnityEditor.AI.NavMeshBuilder.CollectSourcesInStage(
                     transform,
                     layerMask,
@@ -271,9 +239,7 @@ public List<NavMeshBuildSource> CollectSources()
                     gameObject.scene,
                     sources
                 );
-            }
-            else if (collectObjects == CollectObjects.Volume)
-            {
+            } else if (collectObjects == CollectObjects.Volume) {
                 Matrix4x4 localToWorld = Matrix4x4.TRS(
                     transform.position,
                     transform.rotation,
@@ -292,12 +258,10 @@ public List<NavMeshBuildSource> CollectSources()
                     sources
                 );
             }
-        }
-        else
+        } else
 #endif
         {
-            if (collectObjects == CollectObjects.All)
-            {
+            if (collectObjects == CollectObjects.All) {
                 NavMeshBuilder.CollectSources(
                     null,
                     layerMask,
@@ -306,9 +270,7 @@ public List<NavMeshBuildSource> CollectSources()
                     markups,
                     sources
                 );
-            }
-            else if (collectObjects == CollectObjects.Children)
-            {
+            } else if (collectObjects == CollectObjects.Children) {
                 NavMeshBuilder.CollectSources(
                     transform,
                     layerMask,
@@ -317,9 +279,7 @@ public List<NavMeshBuildSource> CollectSources()
                     markups,
                     sources
                 );
-            }
-            else if (collectObjects == CollectObjects.Volume)
-            {
+            } else if (collectObjects == CollectObjects.Volume) {
                 Matrix4x4 localToWorld = Matrix4x4.TRS(
                     transform.position,
                     transform.rotation,
@@ -337,8 +297,7 @@ public List<NavMeshBuildSource> CollectSources()
             }
         }
 
-        if (ignoreNavMeshAgent)
-        {
+        if (ignoreNavMeshAgent) {
             sources.RemoveAll(
                 (x) =>
                     (
@@ -348,8 +307,7 @@ public List<NavMeshBuildSource> CollectSources()
             );
         }
 
-        if (ignoreNavMeshObstacle)
-        {
+        if (ignoreNavMeshObstacle) {
             sources.RemoveAll(
                 (x) =>
                     (
diff --git a/unity/Assets/Scripts/ObjaverseAnnotation.cs b/unity/Assets/Scripts/ObjaverseAnnotation.cs
index b1ff8c370c..25ffcc27cd 100644
--- a/unity/Assets/Scripts/ObjaverseAnnotation.cs
+++ b/unity/Assets/Scripts/ObjaverseAnnotation.cs
@@ -1,17 +1,14 @@
 using System;
 using UnityEngine;
 
-namespace Thor.Objaverse
-{
-    public enum Dataset
-    {
+namespace Thor.Objaverse {
+    public enum Dataset {
         Objaverse1_0,
         ObjaversePlus,
         ObjaverseXL
     }
 
-    public class ObjaverseAnnotation : MonoBehaviour
-    {
+    public class ObjaverseAnnotation : MonoBehaviour {
         [SerializeField]
         public string ObjectCategory;
 
diff --git a/unity/Assets/Scripts/ObjectHighlightController.cs b/unity/Assets/Scripts/ObjectHighlightController.cs
index 7ab2326436..f3496b65f3 100644
--- a/unity/Assets/Scripts/ObjectHighlightController.cs
+++ b/unity/Assets/Scripts/ObjectHighlightController.cs
@@ -12,11 +12,9 @@
 using UnityStandardAssets.Utility;
 using Random = UnityEngine.Random;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
+namespace UnityStandardAssets.Characters.FirstPerson {
     [Serializable]
-    public class HighlightConfig
-    {
+    public class HighlightConfig {
         public Color TextStrongColor;
         public Color TextFaintColor;
         public Color SoftOutlineColor;
@@ -25,8 +23,7 @@ public class HighlightConfig
         public float WithinReachOutlineThickness;
     }
 
-    public class ObjectHighlightController
-    {
+    public class ObjectHighlightController {
         [SerializeField]
         private Text TargetText = null;
 
@@ -46,8 +43,7 @@ public class ObjectHighlightController
         private bool DisplayTargetText = true;
 
         [SerializeField]
-        private HighlightConfig HighlightParams = new HighlightConfig
-        {
+        private HighlightConfig HighlightParams = new HighlightConfig {
             TextStrongColor = new Color(1.0f, 1.0f, 1.0f, 1.0f),
             TextFaintColor = new Color(197.0f / 255, 197.0f / 255, 197.0f / 255, 228.0f / 255),
             SoftOutlineColor = new Color(0.66f, 0.66f, 0.66f, 0.1f),
@@ -89,54 +85,45 @@ public ObjectHighlightController(
             float maxChargeThrowSeconds = 1.4f,
             bool highlightWhileHolding = false,
             HighlightConfig highlightConfig = null
-        )
-        {
+        ) {
             this.PhysicsController = physicsController;
             this.MinHighlightDistance = minHighlightDistance;
             this.MaxThrowForce = maxThrowForce;
             this.withHighlightShader = highlightEnabled;
             this.MaxChargeThrowSeconds = maxChargeThrowSeconds;
             this.highlightWhileHolding = highlightWhileHolding;
-            if (highlightConfig != null)
-            {
+            if (highlightConfig != null) {
                 this.HighlightParams = highlightConfig;
             }
             m_Camera = Camera.main;
             TargetText = GameObject.Find("DebugCanvasPhysics/TargetText").GetComponent<Text>();
             CrosshairText = GameObject.Find("DebugCanvasPhysics/Crosshair").GetComponent<Text>();
             var throwForceBar = GameObject.Find("DebugCanvasPhysics/ThrowForceBar");
-            if (throwForceBar)
-            {
+            if (throwForceBar) {
                 ThrowForceBarSlider = throwForceBar.GetComponent<Slider>();
             }
             this.ThrowEnabled = ThrowEnabled;
             this.highlightShader = Shader.Find("Custom/TransparentOutline");
         }
 
-        public void SetDisplayTargetText(bool display)
-        {
+        public void SetDisplayTargetText(bool display) {
             this.DisplayTargetText = display;
         }
 
-        public void SetOnlyPickableId(string objectId, bool disableHighlightShaderForObject = false)
-        {
+        public void SetOnlyPickableId(string objectId, bool disableHighlightShaderForObject = false) {
             this.onlyPickableObjectId = objectId;
             this.disableHighlightShaderForObject = disableHighlightShaderForObject;
         }
 
-        public void MouseControls()
-        {
+        public void MouseControls() {
             // Interact action for mouse left-click when nothing is picked up
-            if (Input.GetKeyDown(KeyCode.Mouse0))
-            {
+            if (Input.GetKeyDown(KeyCode.Mouse0)) {
                 if (
                     this.PhysicsController.WhatAmIHolding() == null
                     && this.PhysicsController.ReadyForCommand
-                )
-                {
+                ) {
                     var closestObj = this.highlightedObject;
-                    if (closestObj != null)
-                    {
+                    if (closestObj != null) {
                         var actionName = "";
                         if (
                             closestObj.PrimaryProperty == SimObjPrimaryProperty.CanPickup
@@ -144,35 +131,27 @@ public void MouseControls()
                                 onlyPickableObjectId == null
                                 || onlyPickableObjectId == closestObj.objectID
                             )
-                        )
-                        {
+                        ) {
                             pickupState = true;
                             actionName = "PickupObject";
-                        }
-                        else if (closestObj.GetComponent<CanOpen_Object>())
-                        {
+                        } else if (closestObj.GetComponent<CanOpen_Object>()) {
                             actionName = closestObj.GetComponent<CanOpen_Object>().isOpen
                                 ? "CloseObject"
                                 : "OpenObject";
-                        }
-                        else if (closestObj.GetComponent<CanToggleOnOff>())
-                        {
+                        } else if (closestObj.GetComponent<CanToggleOnOff>()) {
                             actionName = closestObj.GetComponent<CanToggleOnOff>().isOn
                                 ? "ToggleObjectOff"
                                 : "ToggleObjectOn";
                         }
 
-                        if (actionName != "")
-                        {
+                        if (actionName != "") {
                             Dictionary<string, object> action = new Dictionary<string, object>();
                             action["action"] = actionName;
                             action["objectId"] = closestObj.objectID;
                             this.PhysicsController.ProcessControlCommand(action);
                         }
                     }
-                }
-                else if (this.PhysicsController.ReadyForCommand)
-                {
+                } else if (this.PhysicsController.ReadyForCommand) {
                     this.mouseDownThrow = true;
                     this.timerAtPress = Time.time;
                 }
@@ -182,21 +161,17 @@ public void MouseControls()
                     && this.highlightedObject != null
                     && this.PhysicsController.WhatAmIHolding() != this.highlightedObject.gameObject
                     && this.PhysicsController.ReadyForCommand
-                )
-                {
+                ) {
                     var closestObj = this.highlightedObject;
-                    if (closestObj != null)
-                    {
+                    if (closestObj != null) {
                         var actionName = "";
-                        if (closestObj.GetComponent<CanOpen_Object>())
-                        {
+                        if (closestObj.GetComponent<CanOpen_Object>()) {
                             actionName = closestObj.GetComponent<CanOpen_Object>().isOpen
                                 ? "CloseObject"
                                 : "OpenObject";
                         }
 
-                        if (actionName != "")
-                        {
+                        if (actionName != "") {
                             Dictionary<string, object> action = new Dictionary<string, object>();
                             action["action"] = actionName;
                             action["objectId"] = closestObj.objectID;
@@ -212,8 +187,7 @@ public void MouseControls()
 
             // simulate TouchThenApply for in-editor debugging stuff
 #if UNITY_EDITOR
-            if (Input.GetKeyDown(KeyCode.Mouse1) && !Input.GetKey(KeyCode.LeftShift))
-            {
+            if (Input.GetKeyDown(KeyCode.Mouse1) && !Input.GetKey(KeyCode.LeftShift)) {
                 Dictionary<string, object> dothis = new Dictionary<string, object>();
 
                 dothis["action"] = "TouchThenApplyForce";
@@ -228,8 +202,7 @@ public void MouseControls()
                 PhysicsController.ProcessControlCommand(dothis);
             }
 
-            if (Input.GetKeyDown(KeyCode.Mouse1) && Input.GetKey(KeyCode.LeftShift))
-            {
+            if (Input.GetKeyDown(KeyCode.Mouse1) && Input.GetKey(KeyCode.LeftShift)) {
                 Dictionary<string, object> dothis = new Dictionary<string, object>();
 
                 dothis["action"] = "TouchThenApplyForce";
@@ -246,16 +219,12 @@ public void MouseControls()
 #endif
 
             // Sets throw bar value
-            if (ThrowEnabled && ThrowForceBarSlider != null)
-            {
-                if (this.mouseDownThrow)
-                {
+            if (ThrowEnabled && ThrowForceBarSlider != null) {
+                if (this.mouseDownThrow) {
                     var diff = Time.time - this.timerAtPress;
                     var clampedForceTime = Mathf.Min(diff * diff, MaxChargeThrowSeconds);
                     ThrowForceBarSlider.value = clampedForceTime / MaxChargeThrowSeconds;
-                }
-                else
-                {
+                } else {
                     ThrowForceBarSlider.value -=
                         ThrowForceBarSlider.value > 0.0f
                             ? Time.deltaTime / MaxChargeThrowSeconds
@@ -264,12 +233,9 @@ public void MouseControls()
             }
 
             // Throw action on left click release
-            if (Input.GetKeyUp(KeyCode.Mouse0))
-            {
-                if (!pickupState)
-                {
-                    if (this.PhysicsController.WhatAmIHolding() != null)
-                    {
+            if (Input.GetKeyUp(KeyCode.Mouse0)) {
+                if (!pickupState) {
+                    if (this.PhysicsController.WhatAmIHolding() != null) {
                         var diff = Time.time - this.timerAtPress;
                         var clampedForceTime = Mathf.Min(diff * diff, MaxChargeThrowSeconds);
                         var force = clampedForceTime * MaxThrowForce / MaxChargeThrowSeconds;
@@ -284,34 +250,27 @@ public void MouseControls()
                                         == highlightedObject.gameObject
                                 )
                             )
-                        )
-                        {
+                        ) {
                             Dictionary<string, object> action = new Dictionary<string, object>();
                             action["forceAction"] = true;
 
-                            if (ThrowEnabled)
-                            {
+                            if (ThrowEnabled) {
                                 action["action"] = "ThrowObject";
                                 action["moveMagnitude"] = force;
-                            }
-                            else
-                            {
+                            } else {
                                 action["action"] = "DropHandObject";
                             }
                             this.PhysicsController.ProcessControlCommand(action);
                             this.mouseDownThrow = false;
                         }
                     }
-                }
-                else
-                {
+                } else {
                     pickupState = false;
                 }
             }
         }
 
-        public void UpdateHighlightedObject(Vector3 screenPosition)
-        {
+        public void UpdateHighlightedObject(Vector3 screenPosition) {
             RaycastHit hit = new RaycastHit();
             var ray = m_Camera.GetComponent<Camera>().ScreenPointToRay(screenPosition);
             int layerMask = LayerMask.GetMask(
@@ -331,12 +290,10 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                 hit.transform != null
                 && hit.transform.tag == "SimObjPhysics"
                 && (this.PhysicsController.WhatAmIHolding() == null || this.highlightWhileHolding)
-            )
-            {
+            ) {
                 softHighlight = true;
                 var simObj = hit.transform.GetComponent<SimObjPhysics>();
-                Func<bool> validObjectLazy = () =>
-                {
+                Func<bool> validObjectLazy = () => {
                     return (
                             simObj.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                             && (
@@ -347,8 +304,7 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                         || simObj.GetComponent<CanOpen_Object>()
                         || simObj.GetComponent<CanToggleOnOff>();
                 };
-                if (simObj != null && validObjectLazy())
-                {
+                if (simObj != null && validObjectLazy()) {
                     var withinReach =
                         PhysicsController.FindObjectInVisibleSimObjPhysics(simObj.objectID) != null;
                     setTargetText(simObj.name, withinReach);
@@ -361,18 +317,15 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                             && simObj.objectID == this.onlyPickableObjectId
                         ) && this.withHighlightShader;
 
-                    if (mRenderer != null && useHighlightShader)
-                    {
-                        if (this.highlightedObject != newHighlightedObject)
-                        {
+                    if (mRenderer != null && useHighlightShader) {
+                        if (this.highlightedObject != newHighlightedObject) {
                             newPreviousShader = mRenderer.material.shader;
                             this.previousRenderQueueValue = mRenderer.material.renderQueue;
                             mRenderer.material.renderQueue = -1;
                             mRenderer.material.shader = this.highlightShader;
                         }
 
-                        if (withinReach)
-                        {
+                        if (withinReach) {
                             softHighlight = true;
                             mRenderer.sharedMaterial.SetFloat(
                                 "_Outline",
@@ -382,9 +335,7 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                                 "_OutlineColor",
                                 this.HighlightParams.WithinReachOutlineColor
                             );
-                        }
-                        else if (softHighlight)
-                        {
+                        } else if (softHighlight) {
                             softHighlight = false;
                             mRenderer.sharedMaterial.SetFloat(
                                 "_Outline",
@@ -397,14 +348,11 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 newHighlightedObject = null;
             }
 
-            if (this.highlightedObject != newHighlightedObject && this.highlightedObject != null)
-            {
+            if (this.highlightedObject != newHighlightedObject && this.highlightedObject != null) {
                 var mRenderer = this.highlightedObject.GetComponentInChildren<MeshRenderer>();
 
                 setTargetText("");
@@ -414,40 +362,33 @@ public void UpdateHighlightedObject(Vector3 screenPosition)
                         && highlightedObject.objectID == this.onlyPickableObjectId
                     ) && this.withHighlightShader;
 
-                if (mRenderer != null && useHighlightShader)
-                {
+                if (mRenderer != null && useHighlightShader) {
                     mRenderer.material.shader = this.previousShader;
                     // TODO unity has a bug for transparent objects they disappear when shader swapping, so we reset the previous shader's render queue value to render it appropiately.
                     mRenderer.material.renderQueue = this.previousRenderQueueValue;
                 }
             }
 
-            if (newPreviousShader != null)
-            {
+            if (newPreviousShader != null) {
                 this.previousShader = newPreviousShader;
             }
 
             this.highlightedObject = newHighlightedObject;
         }
 
-        private void setTargetText(string text, bool withinReach = false)
-        {
+        private void setTargetText(string text, bool withinReach = false) {
             var eps = 1e-5;
-            if (withinReach)
-            {
+            if (withinReach) {
                 this.TargetText.color = this.HighlightParams.TextStrongColor;
                 this.CrosshairText.text = "( + )";
-            }
-            else if (
-                Math.Abs(this.TargetText.color.a - this.HighlightParams.TextStrongColor.a) < eps
-            )
-            {
+            } else if (
+                  Math.Abs(this.TargetText.color.a - this.HighlightParams.TextStrongColor.a) < eps
+              ) {
                 this.TargetText.color = this.HighlightParams.TextFaintColor;
                 this.CrosshairText.text = "+";
             }
 
-            if (DisplayTargetText && TargetText != null)
-            {
+            if (DisplayTargetText && TargetText != null) {
                 // concatenate the name so just the object type is displayed, not the ugly list of letters/numbers (the unique string) after
                 this.TargetText.text = text.Split('_')[0];
             }
diff --git a/unity/Assets/Scripts/ObjectSpawner.cs b/unity/Assets/Scripts/ObjectSpawner.cs
index d3fd29f0c0..179e9657a5 100644
--- a/unity/Assets/Scripts/ObjectSpawner.cs
+++ b/unity/Assets/Scripts/ObjectSpawner.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ObjectSpawner : MonoBehaviour
-{
+public class ObjectSpawner : MonoBehaviour {
     public GameObject[] PrefabToSpawn = null;
 
     // Use this for initialization
diff --git a/unity/Assets/Scripts/ObjectSpecificReceptacle.cs b/unity/Assets/Scripts/ObjectSpecificReceptacle.cs
index 42f4d27dbd..7a6b4fd80e 100644
--- a/unity/Assets/Scripts/ObjectSpecificReceptacle.cs
+++ b/unity/Assets/Scripts/ObjectSpecificReceptacle.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class ObjectSpecificReceptacle : MonoBehaviour
-{
+public class ObjectSpecificReceptacle : MonoBehaviour {
     [Header("Only objects of these Types can be placed on this Receptacle")]
     public SimObjType[] SpecificTypes;
 
@@ -13,14 +12,11 @@ public class ObjectSpecificReceptacle : MonoBehaviour
     [Header("Is this Receptacle already holding a valid object?")]
     public bool full = false;
 
-    public bool HasSpecificType(SimObjType check)
-    {
+    public bool HasSpecificType(SimObjType check) {
         bool result = false;
 
-        foreach (SimObjType sot in SpecificTypes)
-        {
-            if (sot == check)
-            {
+        foreach (SimObjType sot in SpecificTypes) {
+            if (sot == check) {
                 result = true;
             }
         }
@@ -28,14 +24,11 @@ public bool HasSpecificType(SimObjType check)
         return result;
     }
 
-    public bool isFull()
-    {
+    public bool isFull() {
         SimObjPhysics sop = gameObject.GetComponent<SimObjPhysics>();
 
-        foreach (GameObject rtb in sop.ReceptacleTriggerBoxes)
-        {
-            if (rtb.GetComponent<Contains>().isOccupied())
-            {
+        foreach (GameObject rtb in sop.ReceptacleTriggerBoxes) {
+            if (rtb.GetComponent<Contains>().isOccupied()) {
                 full = true;
                 return true;
             }
@@ -46,8 +39,7 @@ public bool isFull()
     }
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
 #if UNITY_EDITOR
         if (
             !gameObject
@@ -55,8 +47,7 @@ void Start()
                 .DoesThisObjectHaveThisSecondaryProperty(
                     SimObjSecondaryProperty.ObjectSpecificReceptacle
                 )
-        )
-        {
+        ) {
             Debug.LogError(
                 this.name + " is missing the Secondary Property ObjectSpecificReceptacle!"
             );
diff --git a/unity/Assets/Scripts/PenDraw.cs b/unity/Assets/Scripts/PenDraw.cs
index 6fa526227b..5abbbdf8ba 100644
--- a/unity/Assets/Scripts/PenDraw.cs
+++ b/unity/Assets/Scripts/PenDraw.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class PenDraw : MonoBehaviour
-{
+public class PenDraw : MonoBehaviour {
     public GameObject penDecal;
     public GameObject raycastOrigin;
 
@@ -15,10 +14,8 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    void OnTriggerStay(Collider other)
-    {
-        if (other.CompareTag("DecalSpawnPlane") && shouldSpawn)
-        {
+    void OnTriggerStay(Collider other) {
+        if (other.CompareTag("DecalSpawnPlane") && shouldSpawn) {
             RaycastHit hit;
             //check if we hit the spawn plane below the pencil
             if (
@@ -29,18 +26,15 @@ void OnTriggerStay(Collider other)
                     Mathf.Infinity,
                     LayerMask.GetMask("Default")
                 )
-            )
-            {
+            ) {
                 //Debug.DrawRay(hit.point, Vector3.up * 10, Color.red);
 
                 //check if we hit another pen mark, if so don't place anything because its too close
-                if (hit.collider.tag == "Pen")
-                {
+                if (hit.collider.tag == "Pen") {
                     return;
                 }
                 //ok so if its not a pen mark, that means we hit a dirt mark which means we can spawn on the table
-                else
-                {
+                else {
                     if (
                         Physics.Raycast(
                             raycastOrigin.transform.position,
@@ -49,14 +43,11 @@ void OnTriggerStay(Collider other)
                             Mathf.Infinity,
                             LayerMask.GetMask("SimObjVisible")
                         )
-                    )
-                    {
+                    ) {
                         Object.Instantiate(penDecal, hit.point, Quaternion.Euler(-90, 0, 0));
                     }
                 }
-            }
-            else
-            {
+            } else {
                 if (
                     Physics.Raycast(
                         raycastOrigin.transform.position,
@@ -65,8 +56,7 @@ void OnTriggerStay(Collider other)
                         Mathf.Infinity,
                         LayerMask.GetMask("SimObjVisible")
                     )
-                )
-                {
+                ) {
                     Object.Instantiate(penDecal, hit.point, Quaternion.Euler(-90, 0, 0));
                 }
             }
diff --git a/unity/Assets/Scripts/PhysicsExtensions.cs b/unity/Assets/Scripts/PhysicsExtensions.cs
index 142b36e99f..fb70fd91e8 100644
--- a/unity/Assets/Scripts/PhysicsExtensions.cs
+++ b/unity/Assets/Scripts/PhysicsExtensions.cs
@@ -25,8 +25,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public static class PhysicsExtensions
-{
+public static class PhysicsExtensions {
     //
     // Box
     //
@@ -37,8 +36,7 @@ public static bool BoxCast(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -61,8 +59,7 @@ public static bool BoxCast(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -85,8 +82,7 @@ public static RaycastHit[] BoxCastAll(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -109,8 +105,7 @@ public static int BoxCastNonAlloc(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -131,8 +126,7 @@ public static bool CheckBox(
         BoxCollider box,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -151,14 +145,12 @@ public static Collider[] OverlapBox(
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal,
         float expandBy = 0.0f
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
         box.ToWorldSpaceBox(out center, out halfExtents, out orientation);
-        if (expandBy != 0.0f)
-        {
+        if (expandBy != 0.0f) {
             halfExtents = new Vector3(
                 expandBy + halfExtents.x,
                 expandBy + halfExtents.y,
@@ -179,8 +171,7 @@ public static int OverlapBoxNonAlloc(
         Collider[] results,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center,
             halfExtents;
         Quaternion orientation;
@@ -200,8 +191,7 @@ public static void ToWorldSpaceBox(
         out Vector3 center,
         out Vector3 halfExtents,
         out Quaternion orientation
-    )
-    {
+    ) {
         orientation = box.transform.rotation;
         center = box.transform.TransformPoint(box.center);
         var lossyScale = box.transform.lossyScale;
@@ -220,8 +210,7 @@ public static bool SphereCast(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -242,8 +231,7 @@ public static RaycastHit[] SphereCastAll(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -264,8 +252,7 @@ public static int SphereCastNonAlloc(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -284,8 +271,7 @@ public static bool CheckSphere(
         SphereCollider sphere,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -297,8 +283,7 @@ public static Collider[] OverlapSphere(
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal,
         float expandBy = 0.0f
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -311,8 +296,7 @@ public static int OverlapSphereNonAlloc(
         Collider[] results,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 center;
         float radius;
         sphere.ToWorldSpaceSphere(out center, out radius);
@@ -329,8 +313,7 @@ public static void ToWorldSpaceSphere(
         this SphereCollider sphere,
         out Vector3 center,
         out float radius
-    )
-    {
+    ) {
         center = sphere.transform.TransformPoint(sphere.center);
         radius = sphere.radius * MaxVec3(AbsVec3(sphere.transform.lossyScale));
     }
@@ -346,8 +329,7 @@ public static bool CapsuleCast(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -370,8 +352,7 @@ public static RaycastHit[] CapsuleCastAll(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -394,8 +375,7 @@ public static int CapsuleCastNonAlloc(
         float maxDistance = Mathf.Infinity,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -416,8 +396,7 @@ public static bool CheckCapsule(
         CapsuleCollider capsule,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -430,8 +409,7 @@ public static Collider[] OverlapCapsule(
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal,
         float expandBy = 0.0f
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -450,8 +428,7 @@ public static int OverlapCapsuleNonAlloc(
         Collider[] results,
         int layerMask = Physics.DefaultRaycastLayers,
         QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal
-    )
-    {
+    ) {
         Vector3 point0,
             point1;
         float radius;
@@ -528,16 +505,14 @@ public static void ToWorldSpaceCapsule(
         out Vector3 point0,
         out Vector3 point1,
         out float radius
-    )
-    {
+    ) {
         var center = capsule.transform.TransformPoint(capsule.center);
         radius = 0f;
         float height = 0f;
         Vector3 lossyScale = AbsVec3(capsule.transform.lossyScale);
         Vector3 dir = Vector3.zero;
 
-        switch (capsule.direction)
-        {
+        switch (capsule.direction) {
             case 0: // x
                 radius = Mathf.Max(lossyScale.y, lossyScale.z) * capsule.radius;
                 height = lossyScale.x * capsule.height;
@@ -555,8 +530,7 @@ out float radius
                 break;
         }
 
-        if (height < radius * 2f)
-        {
+        if (height < radius * 2f) {
             dir = Vector3.zero;
         }
 
@@ -568,15 +542,12 @@ out float radius
     // Util
     //
 
-    public static void SortClosestToFurthest(RaycastHit[] hits, int hitCount = -1)
-    {
-        if (hitCount == 0)
-        {
+    public static void SortClosestToFurthest(RaycastHit[] hits, int hitCount = -1) {
+        if (hitCount == 0) {
             return;
         }
 
-        if (hitCount < 0)
-        {
+        if (hitCount < 0) {
             hitCount = hits.Length;
         }
 
@@ -587,23 +558,19 @@ public static void SortClosestToFurthest(RaycastHit[] hits, int hitCount = -1)
     // Private
     //
 
-    private class AscendingDistanceComparer : IComparer<RaycastHit>
-    {
-        public int Compare(RaycastHit h1, RaycastHit h2)
-        {
+    private class AscendingDistanceComparer : IComparer<RaycastHit> {
+        public int Compare(RaycastHit h1, RaycastHit h2) {
             return h1.distance < h2.distance ? -1 : (h1.distance > h2.distance ? 1 : 0);
         }
     }
 
     private static AscendingDistanceComparer ascendDistance = new AscendingDistanceComparer();
 
-    private static Vector3 AbsVec3(Vector3 v)
-    {
+    private static Vector3 AbsVec3(Vector3 v) {
         return new Vector3(Mathf.Abs(v.x), Mathf.Abs(v.y), Mathf.Abs(v.z));
     }
 
-    private static float MaxVec3(Vector3 v)
-    {
+    private static float MaxVec3(Vector3 v) {
         return Mathf.Max(v.x, Mathf.Max(v.y, v.z));
     }
 }
diff --git a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs
index c5a0357c99..a827d8200a 100644
--- a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs
+++ b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs
@@ -19,16 +19,13 @@
 using UnityStandardAssets.ImageEffects;
 using UnityStandardAssets.Utility;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public class OrientedPoint
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public class OrientedPoint {
         public Vector3 position = new Vector3();
         public Quaternion orientation = new Quaternion();
     }
 
-    public partial class PhysicsRemoteFPSAgentController : BaseFPSAgentController
-    {
+    public partial class PhysicsRemoteFPSAgentController : BaseFPSAgentController {
         protected Dictionary<string, Dictionary<int, Material[]>> maskedObjects =
             new Dictionary<string, Dictionary<int, Material[]>>();
         bool transparentStructureObjectsHidden = false;
@@ -39,13 +36,11 @@ public PhysicsRemoteFPSAgentController(
             BaseAgentComponent baseAgentComponent,
             AgentManager agentManager
         )
-            : base(baseAgentComponent, agentManager)
-        {
+            : base(baseAgentComponent, agentManager) {
             standingLocalCameraPosition = m_Camera.transform.localPosition;
         }
 
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             VisibilityCapsule = TallVisCap;
             m_CharacterController.center = new Vector3(0, 0, 0);
             m_CharacterController.radius = 0.2f;
@@ -76,44 +71,34 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
         // protected float DownwardViewDistance = 2.0f;
 
         // forceVisible is true to activate, false to deactivate
-        public void ToggleHideAndSeekObjects(bool forceVisible = false)
-        {
-            if (physicsSceneManager.ToggleHideAndSeek(forceVisible))
-            {
+        public void ToggleHideAndSeekObjects(bool forceVisible = false) {
+            if (physicsSceneManager.ToggleHideAndSeek(forceVisible)) {
                 physicsSceneManager.ResetObjectIdToSimObjPhysics();
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No HideAndSeek object found";
                 actionFinished(false);
             }
         }
 
-        public Vector3 AgentHandLocation()
-        {
+        public Vector3 AgentHandLocation() {
             return AgentHand.transform.position;
         }
 
-        public GameObject WhatAmIHolding()
-        {
+        public GameObject WhatAmIHolding() {
             return ItemInHand;
         }
 
-        public void EnableTemperatureDecay()
-        {
-            if (!physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature)
-            {
+        public void EnableTemperatureDecay() {
+            if (!physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature) {
                 physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature =
                     true;
             }
             actionFinished(true);
         }
 
-        public void DisableTemperatureDecay()
-        {
-            if (physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature)
-            {
+        public void DisableTemperatureDecay() {
+            if (physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature) {
                 physicsSceneManager.GetComponent<PhysicsSceneManager>().AllowDecayTemperature =
                     false;
             }
@@ -121,10 +106,8 @@ public void DisableTemperatureDecay()
         }
 
         // sets temperature decay for a single object.
-        public void SetTemperatureDecayTime(string objectId, float decayTime)
-        {
-            if (decayTime < 0)
-            {
+        public void SetTemperatureDecayTime(string objectId, float decayTime) {
+            if (decayTime < 0) {
                 throw new ArgumentOutOfRangeException(
                     "decayTime must be >= 0. You gave " + decayTime
                 );
@@ -138,42 +121,34 @@ public void SetTemperatureDecayTime(string objectId, float decayTime)
         }
 
         // globally sets temperature decay for all objects.
-        public void SetTemperatureDecayTime(float decayTime)
-        {
-            if (decayTime < 0)
-            {
+        public void SetTemperatureDecayTime(float decayTime) {
+            if (decayTime < 0) {
                 throw new ArgumentOutOfRangeException(
                     "decayTime must be >= 0. You gave " + decayTime
                 );
             }
             SimObjPhysics[] simObjects = GameObject.FindObjectsOfType<SimObjPhysics>();
-            foreach (SimObjPhysics sop in simObjects)
-            {
+            foreach (SimObjPhysics sop in simObjects) {
                 sop.SetHowManySecondsUntilRoomTemp(decayTime);
             }
             actionFinished(true);
         }
 
         // change the mass/drag/angular drag values of a simobjphys that is pickupable or moveable
-        public void SetMassProperties(string objectId, float mass, float drag, float angularDrag)
-        {
-            if (objectId == null)
-            {
+        public void SetMassProperties(string objectId, float mass, float drag, float angularDrag) {
+            if (objectId == null) {
                 errorMessage = "please give valid ObjectID for SetMassProperties() action";
                 actionFinished(false);
                 return;
             }
 
             SimObjPhysics[] simObjects = GameObject.FindObjectsOfType<SimObjPhysics>();
-            foreach (SimObjPhysics sop in simObjects)
-            {
-                if (sop.objectID == objectId)
-                {
+            foreach (SimObjPhysics sop in simObjects) {
+                if (sop.objectID == objectId) {
                     if (
                         sop.PrimaryProperty == SimObjPrimaryProperty.Moveable
                         || sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup
-                    )
-                    {
+                    ) {
                         Rigidbody rb = sop.GetComponent<Rigidbody>();
                         rb.mass = mass;
                         rb.drag = drag;
@@ -198,22 +173,19 @@ public void SetMassProperties(string objectId, float mass, float drag, float ang
             return;
         }
 
-        public bool isStanding()
-        {
+        public bool isStanding() {
             return (m_Camera.transform.localPosition - standingLocalCameraPosition).magnitude
                 < 0.1f;
         }
 
-        public override MetadataWrapper generateMetadataWrapper()
-        {
+        public override MetadataWrapper generateMetadataWrapper() {
             MetadataWrapper metaWrapper = base.generateMetadataWrapper();
             metaWrapper.agent.isStanding = isStanding();
             return metaWrapper;
         }
 
         // change the radius of the agent's capsule on the char controller component, and the capsule collider component
-        public void SetAgentRadius(float agentRadius = 2.0f)
-        {
+        public void SetAgentRadius(float agentRadius = 2.0f) {
             m_CharacterController.radius = agentRadius;
             CapsuleCollider cap = GetComponent<CapsuleCollider>();
             cap.radius = agentRadius;
@@ -225,14 +197,11 @@ public void SetAgentRadius(float agentRadius = 2.0f)
 #if UNITY_EDITOR
 
         // return ID of closest CanPickup object by distance
-        public string ObjectIdOfClosestVisibleObject()
-        {
+        public string ObjectIdOfClosestVisibleObject() {
             string objectID = null;
 
-            foreach (SimObjPhysics o in VisibleSimObjPhysics)
-            {
-                if (o.PrimaryProperty == SimObjPrimaryProperty.CanPickup)
-                {
+            foreach (SimObjPhysics o in VisibleSimObjPhysics) {
+                if (o.PrimaryProperty == SimObjPrimaryProperty.CanPickup) {
                     objectID = o.ObjectID;
                     //  print(objectID);
                     break;
@@ -242,17 +211,14 @@ public string ObjectIdOfClosestVisibleObject()
             return objectID;
         }
 
-        public string ObjectIdOfClosestPickupableOrMoveableObject()
-        {
+        public string ObjectIdOfClosestPickupableOrMoveableObject() {
             string objectID = null;
 
-            foreach (SimObjPhysics o in VisibleSimObjPhysics)
-            {
+            foreach (SimObjPhysics o in VisibleSimObjPhysics) {
                 if (
                     o.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                     || o.PrimaryProperty == SimObjPrimaryProperty.Moveable
-                )
-                {
+                ) {
                     objectID = o.ObjectID;
                     //  print(objectID);
                     break;
@@ -263,14 +229,11 @@ public string ObjectIdOfClosestPickupableOrMoveableObject()
         }
 
         // return ID of closest CanOpen or CanOpen_Fridge object by distance
-        public string ObjectIdOfClosestVisibleOpenableObject()
-        {
+        public string ObjectIdOfClosestVisibleOpenableObject() {
             string objectID = null;
 
-            foreach (SimObjPhysics o in VisibleSimObjPhysics)
-            {
-                if (o.GetComponent<CanOpen_Object>())
-                {
+            foreach (SimObjPhysics o in VisibleSimObjPhysics) {
+                if (o.GetComponent<CanOpen_Object>()) {
                     objectID = o.ObjectID;
                     break;
                 }
@@ -280,14 +243,11 @@ public string ObjectIdOfClosestVisibleOpenableObject()
         }
 
         // return ID of closes toggleable object by distance
-        public string ObjectIdOfClosestToggleObject()
-        {
+        public string ObjectIdOfClosestToggleObject() {
             string objectID = null;
 
-            foreach (SimObjPhysics o in VisibleSimObjPhysics)
-            {
-                if (o.GetComponent<CanToggleOnOff>())
-                {
+            foreach (SimObjPhysics o in VisibleSimObjPhysics) {
+                if (o.GetComponent<CanToggleOnOff>()) {
                     objectID = o.ObjectID;
                     break;
                 }
@@ -296,14 +256,11 @@ public string ObjectIdOfClosestToggleObject()
             return objectID;
         }
 
-        public string ObjectIdOfClosestReceptacleObject()
-        {
+        public string ObjectIdOfClosestReceptacleObject() {
             string objectID = null;
 
-            foreach (SimObjPhysics o in VisibleSimObjPhysics)
-            {
-                if (o.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-                {
+            foreach (SimObjPhysics o in VisibleSimObjPhysics) {
+                if (o.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
                     objectID = o.ObjectID;
                     break;
                 }
@@ -315,31 +272,24 @@ public string ObjectIdOfClosestReceptacleObject()
         /////////////////////////////////////////////////////////
         // return a reference to a SimObj that is Visible (in the VisibleSimObjPhysics array) and
         // matches the passed in objectID
-        public GameObject FindObjectInVisibleSimObjPhysics(string objectId)
-        {
-            foreach (SimObjPhysics sop in VisibleSimObjs(false))
-            {
-                if (sop.ObjectID == objectId)
-                {
+        public GameObject FindObjectInVisibleSimObjPhysics(string objectId) {
+            foreach (SimObjPhysics sop in VisibleSimObjs(false)) {
+                if (sop.ObjectID == objectId) {
                     return sop.gameObject;
                 }
             }
             return null;
         }
 
-        protected Collider[] collidersWithinCapsuleCastOfAgent(float maxDistance)
-        {
+        protected Collider[] collidersWithinCapsuleCastOfAgent(float maxDistance) {
             CapsuleCollider agentCapsuleCollider = GetComponent<CapsuleCollider>();
             Vector3 point0,
                 point1;
             float radius;
             agentCapsuleCollider.ToWorldSpaceCapsule(out point0, out point1, out radius);
-            if (point0.y <= point1.y)
-            {
+            if (point0.y <= point1.y) {
                 point1.y += maxDistance;
-            }
-            else
-            {
+            } else {
                 point0.y += maxDistance;
             }
             return Physics.OverlapCapsule(
@@ -358,22 +308,16 @@ protected Collider[] collidersWithinCapsuleCastOfAgent(float maxDistance)
         }
 
         // checks if a float is a multiple of 0.1f
-        protected bool CheckIfFloatIsMultipleOfOneTenth(float f)
-        {
-            if (((decimal)f % 0.1M == 0) == false)
-            {
+        protected bool CheckIfFloatIsMultipleOfOneTenth(float f) {
+            if (((decimal)f % 0.1M == 0) == false) {
                 return false;
-            }
-            else
-            {
+            } else {
                 return true;
             }
         }
 
-        public override void LookDown(ServerAction action)
-        {
-            if (action.degrees < 0)
-            {
+        public override void LookDown(ServerAction action) {
+            if (action.degrees < 0) {
                 errorMessage =
                     "LookDown action requires positive degree value. Invalid value used: "
                     + action.degrees;
@@ -381,16 +325,14 @@ public override void LookDown(ServerAction action)
                 return;
             }
 
-            if (!CheckIfFloatIsMultipleOfOneTenth(action.degrees))
-            {
+            if (!CheckIfFloatIsMultipleOfOneTenth(action.degrees)) {
                 errorMessage = "LookDown action requires degree value to be a multiple of 0.1f";
                 actionFinished(false);
                 return;
             }
 
             // default degree increment to 30
-            if (action.degrees == 0)
-            {
+            if (action.degrees == 0) {
                 action.degrees = 30f;
             }
 
@@ -398,8 +340,7 @@ public override void LookDown(ServerAction action)
             // this is to prevent too small of a degree increment change that could cause float imprecision
             action.degrees = Mathf.Round(action.degrees * 10.0f) / 10.0f;
 
-            if (!checkForUpDownAngleLimit("down", action.degrees))
-            {
+            if (!checkForUpDownAngleLimit("down", action.degrees)) {
                 errorMessage =
                     "can't look down beyond "
                     + maxDownwardLookAngle
@@ -409,18 +350,14 @@ public override void LookDown(ServerAction action)
                 return;
             }
 
-            if (CheckIfAgentCanRotate("down", action.degrees))
-            {
+            if (CheckIfAgentCanRotate("down", action.degrees)) {
                 base.LookDown(action);
 
                 // only default hand if not manually Interacting with things
-                if (!action.manualInteract)
-                {
+                if (!action.manualInteract) {
                     DefaultAgentHand();
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     "a held item: "
                     + ItemInHand.transform.GetComponent<SimObjPhysics>().objectID
@@ -431,10 +368,8 @@ public override void LookDown(ServerAction action)
             }
         }
 
-        public override void LookUp(ServerAction action)
-        {
-            if (action.degrees < 0)
-            {
+        public override void LookUp(ServerAction action) {
+            if (action.degrees < 0) {
                 errorMessage =
                     "LookUp action requires positive degree value. Invalid value used: "
                     + action.degrees;
@@ -442,16 +377,14 @@ public override void LookUp(ServerAction action)
                 return;
             }
 
-            if (!CheckIfFloatIsMultipleOfOneTenth(action.degrees))
-            {
+            if (!CheckIfFloatIsMultipleOfOneTenth(action.degrees)) {
                 errorMessage = "LookUp action requires degree value to be a multiple of 0.1f";
                 actionFinished(false);
                 return;
             }
 
             // default degree increment to 30
-            if (action.degrees == 0)
-            {
+            if (action.degrees == 0) {
                 action.degrees = 30f;
             }
 
@@ -459,8 +392,7 @@ public override void LookUp(ServerAction action)
             // this is to prevent too small of a degree increment change that could cause float imprecision
             action.degrees = Mathf.Round(action.degrees * 10.0f) / 10.0f;
 
-            if (!checkForUpDownAngleLimit("up", action.degrees))
-            {
+            if (!checkForUpDownAngleLimit("up", action.degrees)) {
                 errorMessage =
                     "can't look up beyond "
                     + maxUpwardLookAngle
@@ -470,18 +402,14 @@ public override void LookUp(ServerAction action)
                 return;
             }
 
-            if (CheckIfAgentCanRotate("up", action.degrees))
-            {
+            if (CheckIfAgentCanRotate("up", action.degrees)) {
                 base.LookUp(action);
 
                 // only default hand if not manually Interacting with things
-                if (!action.manualInteract)
-                {
+                if (!action.manualInteract) {
                     DefaultAgentHand();
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     "a held item: "
                     + ItemInHand.transform.GetComponent<SimObjPhysics>().objectID
@@ -501,33 +429,25 @@ public virtual void RotateRight(
             bool returnToStart = true, // TODO: Unused, remove when refactoring the controllers
             bool disableRendering = true, // TODO: Unused, remove when refactoring the controllers
             float fixedDeltaTime = 0.02f // TODO: Unused, remove when refactoring the controllers
-        )
-        {
-            if (!degrees.HasValue)
-            {
+        ) {
+            if (!degrees.HasValue) {
                 degrees = rotateStepDegrees;
-            }
-            else if (degrees == 0f)
-            {
+            } else if (degrees == 0f) {
                 throw new InvalidOperationException(
                     "Cannot rotate by 0 degrees as this previously defaulted to rotating by a diferent amount."
                 );
             }
 
-            if (CheckIfAgentCanRotate("right", degrees.Value) || forceAction)
-            {
+            if (CheckIfAgentCanRotate("right", degrees.Value) || forceAction) {
                 transform.Rotate(0, degrees.Value, 0);
 
                 // only default hand if not manually Interacting with things
-                if (!manualInteract)
-                {
+                if (!manualInteract) {
                     DefaultAgentHand();
                 }
 
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     $"a held item: {ItemInHand.transform.name} with something if agent rotates Right {degrees} degrees";
                 actionFinished(false);
@@ -543,33 +463,25 @@ public virtual void RotateLeft(
             bool returnToStart = true, // TODO: Unused, remove when refactoring the controllers
             bool disableRendering = true, // TODO: Unused, remove when refactoring the controllers
             float fixedDeltaTime = 0.02f // TODO: Unused, remove when refactoring the controllers
-        )
-        {
-            if (!degrees.HasValue)
-            {
+        ) {
+            if (!degrees.HasValue) {
                 degrees = rotateStepDegrees;
-            }
-            else if (degrees == 0f)
-            {
+            } else if (degrees == 0f) {
                 throw new InvalidOperationException(
                     "Cannot rotate by 0 degrees as this previously defaulted to rotating by a diferent amount."
                 );
             }
 
-            if (CheckIfAgentCanRotate("left", degrees.Value) || forceAction)
-            {
+            if (CheckIfAgentCanRotate("left", degrees.Value) || forceAction) {
                 transform.Rotate(0, -degrees.Value, 0);
 
                 // only default hand if not manually Interacting with things
-                if (!manualInteract)
-                {
+                if (!manualInteract) {
                     DefaultAgentHand();
                 }
 
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     $"a held item: {ItemInHand.transform.name} with something if agent rotates Left {degrees} degrees";
                 actionFinished(false);
@@ -582,8 +494,7 @@ private bool checkArcForCollisions(
             float degrees,
             int dirSign,
             Vector3 dirAxis
-        )
-        {
+        ) {
             bool result = true;
             float arcIncrementDistance;
             Vector3 bbWorldCenter = bb.transform.TransformPoint(bb.center);
@@ -603,8 +514,7 @@ Vector3 dirAxis
             arcIncrementDistance = (pointsOnArc[1].position - pointsOnArc[0].position).magnitude;
 
             // Raycast from first point in pointsOnArc, stepwise to last point. If any collisions are hit, immediately return
-            for (int i = 0; i < pointsOnArc.Length - 1; i++)
-            {
+            for (int i = 0; i < pointsOnArc.Length - 1; i++) {
                 RaycastHit hit;
                 // do boxcasts from the first point, sequentially, to the last
 
@@ -632,8 +542,7 @@ Vector3 dirAxis
                         ),
                         QueryTriggerInteraction.Ignore
                     )
-                )
-                {
+                ) {
                     // did we hit a sim obj?
                     if (
                         (
@@ -641,8 +550,7 @@ Vector3 dirAxis
                             && hit.transform.GetComponentInParent<SimObjPhysics>().transform
                                 == ItemInHand.transform
                         ) || (hit.transform == this.transform)
-                    )
-                    {
+                    ) {
                         // if the sim obj we hit is what we are holding, skip
                         // don't worry about clipping the object into this agent
                         continue;
@@ -673,21 +581,17 @@ Vector3 dirAxis
                 QueryTriggerInteraction.Ignore
             );
 
-            foreach (Collider col in WhatDidWeHit)
-            {
-                if (col.transform.GetComponentInParent<SimObjPhysics>())
-                {
+            foreach (Collider col in WhatDidWeHit) {
+                if (col.transform.GetComponentInParent<SimObjPhysics>()) {
                     if (
                         col.transform.GetComponentInParent<SimObjPhysics>().transform
                         == ItemInHand.transform
-                    )
-                    {
+                    ) {
                         continue;
                     }
                 }
 
-                if (col.transform == this.transform)
-                {
+                if (col.transform == this.transform) {
                     continue;
                 }
 
@@ -706,15 +610,13 @@ private OrientedPoint[] GenerateArcPoints(
             float angle,
             int dirSign,
             Vector3 dirAxis
-        )
-        {
+        ) {
             float incrementAngle = angle / 10f; // divide the total amount we are rotating by 10 to get 10 points on the arc for positions
             OrientedPoint[] arcPoints = new OrientedPoint[11]; // we just always want 10 points in addition to our starting corner position (11 total) to check against per corner
             float currentIncrementAngle;
 
             // Calculate positions of all 10 OrientedPoints
-            for (int i = 0; i < arcPoints.Length; i++)
-            {
+            for (int i = 0; i < arcPoints.Length; i++) {
                 currentIncrementAngle = i * dirSign * incrementAngle;
                 // Move and orient the rotPoint to the bb's position and orientation
                 rotPoint.transform.position = startingPoint;
@@ -760,10 +662,8 @@ Vector3 dirAxis
         // }
 
         // checks if agent is clear to rotate left/right/up/down some number of degrees while holding an object
-        public bool CheckIfAgentCanRotate(string direction, float degrees)
-        {
-            if (ItemInHand == null)
-            {
+        public bool CheckIfAgentCanRotate(string direction, float degrees) {
+            if (ItemInHand == null) {
                 // Debug.Log("Rotation check passed: nothing in Agent Hand");
                 return true;
             }
@@ -781,29 +681,25 @@ public bool CheckIfAgentCanRotate(string direction, float degrees)
             Vector3 origin = m_CharacterController.transform.position;
 
             // Yawing left (Rotating negatively across XZ plane around CharacterController)
-            if (direction == "left")
-            {
+            if (direction == "left") {
                 dirSign = -1;
                 dirAxis = transform.up;
                 origin = m_CharacterController.transform.position;
             }
             // Yawing right (Rotating positively across XZ plane around CharacterController)
-            else if (direction == "right")
-            {
+            else if (direction == "right") {
                 dirSign = 1;
                 dirAxis = transform.up;
                 origin = m_CharacterController.transform.position;
             }
             // Pitching up (Rotating negatively across YZ plane around camera)
-            else if (direction == "up")
-            {
+            else if (direction == "up") {
                 dirSign = -1;
                 dirAxis = transform.right;
                 origin = m_Camera.transform.position;
             }
             // Pitching down (Rotating positively across YZ plane around camera)
-            else if (direction == "down")
-            {
+            else if (direction == "down") {
                 dirSign = 1;
                 dirAxis = transform.right;
                 origin = m_Camera.transform.position;
@@ -816,26 +712,22 @@ public bool CheckIfAgentCanRotate(string direction, float degrees)
         }
 
         // params are named x,y,z due to the action orignally using ServerAction.x,y,z
-        public void ChangeAgentColor(float x, float y, float z)
-        {
+        public void ChangeAgentColor(float x, float y, float z) {
             agentManager.UpdateAgentColor(this, new Color(x, y, z, 1.0f));
             actionFinished(true);
         }
 
-        protected Vector3 closestPointToObject(SimObjPhysics sop)
-        {
+        protected Vector3 closestPointToObject(SimObjPhysics sop) {
             float closestDist = 10000.0f;
             Vector3 closestPoint = new Vector3(0f, 0f, 0f);
 
-            foreach (Collider c in sop.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in sop.GetComponentsInChildren<Collider>()) {
                 Vector3 point = c.ClosestPointOnBounds(transform.position);
                 float dist = Vector3.Distance(
                     transform.position,
                     c.ClosestPointOnBounds(transform.position)
                 );
-                if (dist < closestDist)
-                {
+                if (dist < closestDist) {
                     closestDist = dist;
                     closestPoint = point;
                 }
@@ -843,14 +735,12 @@ protected Vector3 closestPointToObject(SimObjPhysics sop)
             return closestPoint;
         }
 
-        public void PointsOverTableWhereHandCanBe(string objectId, float x, float z)
-        {
+        public void PointsOverTableWhereHandCanBe(string objectId, float x, float z) {
             // Assumes InitializeTableSetting has been run before calling this
 
             string tableId = objectId;
 
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -863,15 +753,12 @@ public void PointsOverTableWhereHandCanBe(string objectId, float x, float z)
 
             AgentHand.transform.position = AgentHand.transform.position;
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.SetActive(false);
             }
             List<Vector3> goodPositions = new List<Vector3>();
-            for (int i = -xSteps; i <= xSteps; i++)
-            {
-                for (int j = zStart; j < 11; j++)
-                {
+            for (int i = -xSteps; i <= xSteps; i++) {
+                for (int j = zStart; j < 11; j++) {
                     DefaultAgentHand();
 
                     Vector3 testPosition =
@@ -894,20 +781,17 @@ public void PointsOverTableWhereHandCanBe(string objectId, float x, float z)
                                 "Procedural0"
                             )
                         )
-                    )
-                    {
+                    ) {
                         Vector3 viewportPoint = m_Camera.WorldToViewportPoint(hit.point);
                         if (
                             viewportPoint.x >= 0f
                             && viewportPoint.x <= 1f
                             && viewportPoint.y >= 0f
                             && viewportPoint.y <= 1f
-                        )
-                        {
+                        ) {
                             SimObjPhysics hitSop =
                                 hit.transform.gameObject.GetComponent<SimObjPhysics>();
-                            if (hitSop && hitSop.ObjectID == tableId)
-                            {
+                            if (hitSop && hitSop.ObjectID == tableId) {
                                 goodPositions.Add(hit.point);
 #if UNITY_EDITOR
                                 Debug.Log("Point");
@@ -928,8 +812,7 @@ public void PointsOverTableWhereHandCanBe(string objectId, float x, float z)
                 }
             }
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.SetActive(true);
             }
 
@@ -937,10 +820,8 @@ public void PointsOverTableWhereHandCanBe(string objectId, float x, float z)
             actionFinished(true, goodPositions);
         }
 
-        public void PlaceFixedReceptacleAtLocation(int objectVariation, float x, float y, float z)
-        {
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+        public void PlaceFixedReceptacleAtLocation(int objectVariation, float x, float y, float z) {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "Invalid receptacle variation.";
                 actionFinished(false);
                 return;
@@ -949,8 +830,7 @@ public void PlaceFixedReceptacleAtLocation(int objectVariation, float x, float y
             if (
                 physicsSceneManager.ManipulatorReceptacles == null
                 || physicsSceneManager.ManipulatorReceptacles.Length == 0
-            )
-            {
+            ) {
                 errorMessage = "Scene does not have manipulator receptacles set.";
                 actionFinished(false);
                 return;
@@ -960,22 +840,18 @@ public void PlaceFixedReceptacleAtLocation(int objectVariation, float x, float y
             float[] yoffsets = { 0f, -0.0277601f, 0f, 0f, 0f };
 
             string receptId = "";
-            for (int i = 0; i < 5; i++)
-            {
+            for (int i = 0; i < 5; i++) {
                 GameObject recept = physicsSceneManager.ManipulatorReceptacles[i];
                 SimObjPhysics receptSop = recept.GetComponent<SimObjPhysics>();
 
-                if (objectVariation == i)
-                {
+                if (objectVariation == i) {
                     recept.SetActive(true);
                     recept.GetComponent<Rigidbody>().isKinematic = true;
                     recept.transform.position = new Vector3(x, y + yoffsets[i], z);
                     recept.transform.rotation = transform.rotation;
                     physicsSceneManager.AddToObjectsInScene(receptSop);
                     receptId = receptSop.ObjectID;
-                }
-                else if (recept.activeInHierarchy)
-                {
+                } else if (recept.activeInHierarchy) {
                     physicsSceneManager.RemoveFromObjectsInScene(receptSop);
                     recept.SetActive(false);
                 }
@@ -990,20 +866,17 @@ public void PlaceBookWallAtLocation(
             float y,
             float z,
             Vector3 rotation
-        )
-        {
+        ) {
             if (
                 physicsSceneManager.ManipulatorBooks == null
                 || physicsSceneManager.ManipulatorBooks.Length == 0
-            )
-            {
+            ) {
                 errorMessage = "Scene does not have manipulator books set.";
                 actionFinished(false);
                 return;
             }
 
-            if (objectVariation < 0)
-            {
+            if (objectVariation < 0) {
                 errorMessage = "objectVariation must be >= 0";
                 actionFinished(false);
                 return;
@@ -1013,14 +886,10 @@ Vector3 rotation
 
             // uint which = (uint) Convert.ToUInt32(action.objectVariation);
             // List<bool> whichIncluded = new List<bool>();
-            for (int i = 0; i < 5; i++)
-            {
-                if (((objectVariation >> i) % 2) == 1)
-                {
+            for (int i = 0; i < 5; i++) {
+                if (((objectVariation >> i) % 2) == 1) {
                     physicsSceneManager.ManipulatorBooks[i].transform.gameObject.SetActive(true);
-                }
-                else
-                {
+                } else {
                     physicsSceneManager.ManipulatorBooks[i].transform.gameObject.SetActive(false);
                 }
                 // whichIncluded.Add(
@@ -1044,47 +913,34 @@ Vector3 rotation
             actionFinished(true);
         }
 
-        public void InitializeTableSetting(int objectVariation)
-        {
+        public void InitializeTableSetting(int objectVariation) {
             string scene = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
 
             Vector3 newPosition = transform.position;
             Quaternion newRotation = transform.rotation;
 
-            if (scene == "FloorPlan501_physics")
-            {
+            if (scene == "FloorPlan501_physics") {
                 newPosition = new Vector3(0f, transform.position.y, 0.75f);
                 newRotation = Quaternion.Euler(0f, 180f, 0f);
-            }
-            else if (scene == "FloorPlan502_physics")
-            {
+            } else if (scene == "FloorPlan502_physics") {
                 newPosition = new Vector3(-0.5f, transform.position.y, 0.75f);
                 newRotation = Quaternion.Euler(0f, 90f, 0f);
-            }
-            else if (scene == "FloorPlan503_physics")
-            {
+            } else if (scene == "FloorPlan503_physics") {
                 newPosition = new Vector3(-0.5f, transform.position.y, -0.25f);
                 newRotation = Quaternion.Euler(0f, 0f, 0f);
-            }
-            else if (scene == "FloorPlan504_physics")
-            {
+            } else if (scene == "FloorPlan504_physics") {
                 newPosition = new Vector3(0f, transform.position.y, 0.5f);
                 newRotation = Quaternion.Euler(0f, 180f, 0f);
-            }
-            else if (scene == "FloorPlan505_physics")
-            {
+            } else if (scene == "FloorPlan505_physics") {
                 newPosition = new Vector3(0f, transform.position.y, 1.25f);
                 newRotation = Quaternion.Euler(0f, 180f, 0f);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Cannot initialize table in scene " + scene;
                 actionFinished(false);
                 return;
             }
 
-            if (objectVariation < 0 || objectVariation > 4)
-            {
+            if (objectVariation < 0 || objectVariation > 4) {
                 errorMessage = "Invalid table variation.";
                 actionFinished(false);
                 return;
@@ -1093,43 +949,35 @@ public void InitializeTableSetting(int objectVariation)
             transform.position = newPosition;
             transform.rotation = newRotation;
 
-            if (m_Camera.fieldOfView != 90f)
-            {
+            if (m_Camera.fieldOfView != 90f) {
                 m_Camera.fieldOfView = 90f;
             }
             m_Camera.transform.localEulerAngles = new Vector3(30f, 0.0f, 0.0f);
 
             string tableId = "";
-            for (int i = 0; i < 5; i++)
-            {
+            for (int i = 0; i < 5; i++) {
                 GameObject table = physicsSceneManager.ManipulatorTables[i];
                 SimObjPhysics tableSop = table.GetComponent<SimObjPhysics>();
 
-                if (objectVariation == i)
-                {
+                if (objectVariation == i) {
                     table.SetActive(true);
                     physicsSceneManager.AddToObjectsInScene(tableSop);
                     tableId = tableSop.ObjectID;
-                }
-                else if (table.activeInHierarchy)
-                {
+                } else if (table.activeInHierarchy) {
                     physicsSceneManager.RemoveFromObjectsInScene(tableSop);
                     table.SetActive(false);
                 }
 
                 GameObject recept = physicsSceneManager.ManipulatorReceptacles[i];
                 SimObjPhysics receptSop = recept.GetComponent<SimObjPhysics>();
-                if (recept.activeInHierarchy)
-                {
+                if (recept.activeInHierarchy) {
                     physicsSceneManager.RemoveFromObjectsInScene(receptSop);
                     recept.SetActive(false);
                 }
             }
 
-            if (physicsSceneManager.ManipulatorBooks != null)
-            {
-                foreach (GameObject book in physicsSceneManager.ManipulatorBooks)
-                {
+            if (physicsSceneManager.ManipulatorBooks != null) {
+                foreach (GameObject book in physicsSceneManager.ManipulatorBooks) {
                     book.SetActive(false);
                 }
             }
@@ -1137,22 +985,18 @@ public void InitializeTableSetting(int objectVariation)
             actionFinished(true, tableId);
         }
 
-        public float GetXZRadiusOfObject(SimObjPhysics sop)
-        {
+        public float GetXZRadiusOfObject(SimObjPhysics sop) {
             BoxCollider bc = sop.BoundingBox.GetComponent<BoxCollider>();
             return (new Vector3(bc.size.x, 0f, bc.size.z) * 0.5f).magnitude;
         }
 
-        public void GetUnreachableSilhouetteForObject(string objectId, float z)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void GetUnreachableSilhouetteForObject(string objectId, float z) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
             }
-            if (z <= 0.0f)
-            {
+            if (z <= 0.0f) {
                 errorMessage = "Interactable distance (z) must be > 0";
                 actionFinished(false);
                 return;
@@ -1172,29 +1016,21 @@ public void GetUnreachableSilhouetteForObject(string objectId, float z)
             var sb = new System.Text.StringBuilder();
             int halfWidth =
                 1 + ((int)Math.Round((objectRad + z + m_CharacterController.radius) / gridSize));
-            for (int i = 2 * halfWidth; i >= 0; i--)
-            {
+            for (int i = 2 * halfWidth; i >= 0; i--) {
                 float zOffset = ((i - halfWidth) * gridSize);
 
-                for (int j = 0; j < 2 * halfWidth + 1; j++)
-                {
+                for (int j = 0; j < 2 * halfWidth + 1; j++) {
                     float xOffset = ((j - halfWidth) * gridSize);
-                    if (j != 0)
-                    {
+                    if (j != 0) {
                         sb.Append(" ");
                     }
                     transform.position =
                         targetObject.transform.position + new Vector3(xOffset, 0f, zOffset);
-                    if (isAgentCapsuleCollidingWith(targetObject.gameObject))
-                    {
+                    if (isAgentCapsuleCollidingWith(targetObject.gameObject)) {
                         sb.Append("1");
-                    }
-                    else if (distanceToObject(targetObject) <= z)
-                    {
+                    } else if (distanceToObject(targetObject) <= z) {
                         sb.Append("2");
-                    }
-                    else
-                    {
+                    } else {
                         sb.Append("0");
                     }
                 }
@@ -1213,16 +1049,13 @@ public void GetUnreachableSilhouetteForObject(string objectId, float z)
             actionFinished(true, mat);
         }
 
-        public void RandomlyCreateLiftedFurniture(ServerAction action)
-        {
-            if (action.z < 0.25f)
-            {
+        public void RandomlyCreateLiftedFurniture(ServerAction action) {
+            if (action.z < 0.25f) {
                 errorMessage = "z must be at least 0.25";
                 actionFinished(false);
                 return;
             }
-            if (action.y == 0.0f)
-            {
+            if (action.y == 0.0f) {
                 errorMessage = "y must be non-zero";
                 actionFinished(false);
                 return;
@@ -1231,26 +1064,21 @@ public void RandomlyCreateLiftedFurniture(ServerAction action)
 
             List<Vector3> oldAgentPositions = new List<Vector3>();
             List<Quaternion> oldAgentRotations = new List<Quaternion>();
-            foreach (BaseFPSAgentController agent in this.agentManager.agents)
-            {
+            foreach (BaseFPSAgentController agent in this.agentManager.agents) {
                 oldAgentPositions.Add(agent.transform.position);
                 agent.transform.position = new Vector3(50f, 50f, 50f);
                 oldAgentRotations.Add(agent.transform.rotation);
             }
             SimObjPhysics objectCreated = null;
-            try
-            {
+            try {
                 objectCreated = randomlyCreateAndPlaceObjectOnFloor(
                     action.objectType,
                     action.objectVariation,
                     reachablePositions
                 );
-            }
-            catch (Exception) { }
-            if (objectCreated == null)
-            {
-                for (int i = 0; i < this.agentManager.agents.Count; i++)
-                {
+            } catch (Exception) { }
+            if (objectCreated == null) {
+                for (int i = 0; i < this.agentManager.agents.Count; i++) {
                     var agent = this.agentManager.agents[i];
                     agent.transform.position = oldAgentPositions[i];
                     agent.transform.rotation = oldAgentRotations[i];
@@ -1270,98 +1098,77 @@ public void RandomlyCreateLiftedFurniture(ServerAction action)
             List<float> rotations = rotationsArr.ToList();
 
             bool placementSuccess = false;
-            for (int i = 0; i < 10; i++)
-            {
-                if (objectFloating)
-                {
+            for (int i = 0; i < 10; i++) {
+                if (objectFloating) {
                     List<Vector3> candidatePositionsList = new List<Vector3>();
-                    foreach (Vector3 p in reachablePositions)
-                    {
+                    foreach (Vector3 p in reachablePositions) {
                         transform.position = p;
-                        if (isAgentCapsuleColliding(collidersToIgnoreDuringMovement))
-                        {
+                        if (isAgentCapsuleColliding(collidersToIgnoreDuringMovement)) {
                             continue;
                         }
-                        if (distanceToObject(objectCreated) <= action.z)
-                        {
+                        if (distanceToObject(objectCreated) <= action.z) {
                             candidatePositionsList.Add(p);
                         }
                     }
                     transform.position = new Vector3(50f, 50f, 50f);
 
-                    if (candidatePositionsList.Count >= agentManager.agents.Count)
-                    {
+                    if (candidatePositionsList.Count >= agentManager.agents.Count) {
                         candidatePositionsList.Shuffle_();
                         foreach (
                             Vector3[] candidatePositions in UtilityFunctions.Combinations(
                                 candidatePositionsList.ToArray(),
                                 agentManager.agents.Count
                             )
-                        )
-                        {
+                        ) {
                             bool candidatesBad = false;
-                            for (int j = 0; j < candidatePositions.Length - 1; j++)
-                            {
+                            for (int j = 0; j < candidatePositions.Length - 1; j++) {
                                 Vector3 p0 = candidatePositions[j];
-                                for (int k = j + 1; k < candidatePositions.Length; k++)
-                                {
+                                for (int k = j + 1; k < candidatePositions.Length; k++) {
                                     Vector3 p1 = candidatePositions[k];
                                     if (
                                         Math.Abs(p1.x - p0.x) < 0.4999f
                                         && Math.Abs(p1.z - p0.z) < 0.4999f
-                                    )
-                                    {
+                                    ) {
                                         candidatesBad = true;
                                     }
-                                    if (candidatesBad)
-                                    {
+                                    if (candidatesBad) {
                                         break;
                                     }
                                 }
-                                if (candidatesBad)
-                                {
+                                if (candidatesBad) {
                                     break;
                                 }
                             }
-                            if (candidatesBad)
-                            {
+                            if (candidatesBad) {
                                 continue;
                             }
                             placementSuccess = true;
 
-                            for (int j = 0; j < agentManager.agents.Count; j++)
-                            {
+                            for (int j = 0; j < agentManager.agents.Count; j++) {
                                 var agent = (PhysicsRemoteFPSAgentController)agentManager.agents[j];
                                 agent.transform.position = candidatePositions[j];
 
-                                foreach (float r in rotations.Shuffle_())
-                                {
+                                foreach (float r in rotations.Shuffle_()) {
                                     agent.transform.rotation = Quaternion.Euler(
                                         new Vector3(0f, r, 0f)
                                     );
-                                    if (agent.objectIsCurrentlyVisible(objectCreated, 100f))
-                                    {
+                                    if (agent.objectIsCurrentlyVisible(objectCreated, 100f)) {
                                         break;
                                     }
                                 }
                             }
                             break;
                         }
-                        if (placementSuccess)
-                        {
+                        if (placementSuccess) {
                             break;
                         }
                     }
                 }
 
-                if (placementSuccess)
-                {
+                if (placementSuccess) {
                     break;
-                }
-                else
-                {
-                    foreach (BaseFPSAgentController agent in this.agentManager.agents)
-                    {
+                } else {
+                    foreach (BaseFPSAgentController agent in this.agentManager.agents) {
                         agent.transform.position = new Vector3(50f, 50f, 50f);
                     }
                     randomlyPlaceObjectOnFloor(objectCreated, reachablePositions);
@@ -1372,10 +1179,8 @@ Vector3[] candidatePositions in UtilityFunctions.Combinations(
                 }
             }
 
-            if (!placementSuccess)
-            {
-                for (int i = 0; i < this.agentManager.agents.Count; i++)
-                {
+            if (!placementSuccess) {
+                for (int i = 0; i < this.agentManager.agents.Count; i++) {
                     var agent = this.agentManager.agents[i];
                     agent.transform.position = oldAgentPositions[i];
                     agent.transform.rotation = oldAgentRotations[i];
@@ -1394,13 +1199,11 @@ protected bool moveObject(
             Vector3 targetPosition,
             bool snapToGrid = false,
             HashSet<Transform> ignoreCollisionWithTransforms = null
-        )
-        {
+        ) {
             Vector3 lastPosition = sop.transform.position;
             // Rigidbody ItemRB = sop.gameObject.GetComponent<Rigidbody>(); no longer needs rb reference
 
-            if (snapToGrid)
-            {
+            if (snapToGrid) {
                 float mult = 1.0f / gridSize;
                 float gridX = Convert.ToSingle(Math.Round(targetPosition.x * mult) / mult);
                 float gridZ = Convert.ToSingle(Math.Round(targetPosition.z * mult) / mult);
@@ -1423,15 +1226,12 @@ protected bool moveObject(
                 QueryTriggerInteraction.Ignore
             );
 
-            if (sweepResults.Length > 0)
-            {
-                foreach (RaycastHit hit in sweepResults)
-                {
+            if (sweepResults.Length > 0) {
+                foreach (RaycastHit hit in sweepResults) {
                     if (
                         ignoreCollisionWithTransforms == null
                         || !ignoreCollisionWithTransforms.Contains(hit.transform)
-                    )
-                    {
+                    ) {
                         errorMessage =
                             hit.transform.name + " is in the way of moving " + sop.ObjectID;
                         return false;
@@ -1446,27 +1246,21 @@ protected bool moveLiftedObjectHelper(
             string objectId,
             Vector3 relativeDir,
             float maxAgentsDistance = -1.0f
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 return false;
             }
             SimObjPhysics objectToMove = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
             Vector3 oldPosition = objectToMove.transform.position;
-            if (moveObject(objectToMove, objectToMove.transform.position + relativeDir, true))
-            {
-                if (maxAgentsDistance > 0.0f)
-                {
-                    for (int i = 0; i < agentManager.agents.Count; i++)
-                    {
+            if (moveObject(objectToMove, objectToMove.transform.position + relativeDir, true)) {
+                if (maxAgentsDistance > 0.0f) {
+                    for (int i = 0; i < agentManager.agents.Count; i++) {
                         if (
                             (
                                 (PhysicsRemoteFPSAgentController)agentManager.agents[i]
                             ).distanceToObject(objectToMove) > maxAgentsDistance
-                        )
-                        {
+                        ) {
                             objectToMove.transform.position = oldPosition;
                             errorMessage =
                                 "Would move object beyond max distance from agent " + i.ToString();
@@ -1475,25 +1269,20 @@ protected bool moveLiftedObjectHelper(
                     }
                 }
                 return true;
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
 
-        public void CollidersObjectCollidingWith(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void CollidersObjectCollidingWith(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
             }
             List<string> collidingWithNames = new List<string>();
             GameObject go = physicsSceneManager.ObjectIdToSimObjPhysics[objectId].gameObject;
-            foreach (Collider c in UtilityFunctions.collidersObjectCollidingWith(go))
-            {
+            foreach (Collider c in UtilityFunctions.collidersObjectCollidingWith(go)) {
                 collidingWithNames.Add(c.name);
 #if UNITY_EDITOR
                 Debug.Log(c.name);
@@ -1506,12 +1295,10 @@ protected bool moveObjectWithTeleport(
             SimObjPhysics sop,
             Vector3 targetPosition,
             bool snapToGrid = false
-        )
-        {
+        ) {
             Vector3 lastPosition = sop.transform.position;
 
-            if (snapToGrid)
-            {
+            if (snapToGrid) {
                 float mult = 1.0f / gridSize;
                 float gridX = Convert.ToSingle(Math.Round(targetPosition.x * mult) / mult);
                 float gridZ = Convert.ToSingle(Math.Round(targetPosition.z * mult) / mult);
@@ -1521,15 +1308,13 @@ protected bool moveObjectWithTeleport(
             Vector3 oldPosition = sop.transform.position;
             sop.transform.position = targetPosition;
 
-            if (UtilityFunctions.isObjectColliding(sop.gameObject))
-            {
+            if (UtilityFunctions.isObjectColliding(sop.gameObject)) {
                 sop.transform.position = oldPosition;
                 errorMessage = sop.ObjectID + " is colliding after teleport.";
                 return false;
             }
 
-            foreach (BaseFPSAgentController agent in agentManager.agents)
-            {
+            foreach (BaseFPSAgentController agent in agentManager.agents) {
                 // This check is stupid but seems necessary to appease the unity gods
                 // as unity doesn't realize the object collides with the agents in
                 // the above checks in some cases.
@@ -1537,8 +1322,7 @@ protected bool moveObjectWithTeleport(
                     ((PhysicsRemoteFPSAgentController)agent).isAgentCapsuleCollidingWith(
                         sop.gameObject
                     )
-                )
-                {
+                ) {
                     sop.transform.position = oldPosition;
                     errorMessage = sop.ObjectID + " is colliding with an agent after movement.";
                     return false;
@@ -1548,8 +1332,7 @@ protected bool moveObjectWithTeleport(
             return true;
         }
 
-        public void MoveLiftedObjectAhead(ServerAction action)
-        {
+        public void MoveLiftedObjectAhead(ServerAction action) {
             float mag = action.moveMagnitude > 0 ? action.moveMagnitude : gridSize;
             actionFinished(
                 moveLiftedObjectHelper(
@@ -1560,8 +1343,7 @@ public void MoveLiftedObjectAhead(ServerAction action)
             );
         }
 
-        public void MoveLiftedObjectRight(ServerAction action)
-        {
+        public void MoveLiftedObjectRight(ServerAction action) {
             float mag = action.moveMagnitude > 0 ? action.moveMagnitude : gridSize;
             actionFinished(
                 moveLiftedObjectHelper(
@@ -1572,8 +1354,7 @@ public void MoveLiftedObjectRight(ServerAction action)
             );
         }
 
-        public void MoveLiftedObjectLeft(ServerAction action)
-        {
+        public void MoveLiftedObjectLeft(ServerAction action) {
             float mag = action.moveMagnitude > 0 ? action.moveMagnitude : gridSize;
             actionFinished(
                 moveLiftedObjectHelper(
@@ -1584,8 +1365,7 @@ public void MoveLiftedObjectLeft(ServerAction action)
             );
         }
 
-        public void MoveLiftedObjectBack(ServerAction action)
-        {
+        public void MoveLiftedObjectBack(ServerAction action) {
             float mag = action.moveMagnitude > 0 ? action.moveMagnitude : gridSize;
             actionFinished(
                 moveLiftedObjectHelper(
@@ -1596,20 +1376,15 @@ public void MoveLiftedObjectBack(ServerAction action)
             );
         }
 
-        public void RotateLiftedObjectRight(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void RotateLiftedObjectRight(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 Debug.Log(errorMessage);
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
-                if (ItemInHand != null && sop == ItemInHand.GetComponent<SimObjPhysics>())
-                {
+                if (ItemInHand != null && sop == ItemInHand.GetComponent<SimObjPhysics>()) {
                     errorMessage = "Cannot rotate lifted object in hand.";
                     Debug.Log(errorMessage);
                     actionFinished(false);
@@ -1624,18 +1399,14 @@ public void RotateLiftedObjectRight(ServerAction action)
                     )
                 );
                 ;
-                if (!action.forceAction)
-                {
-                    if (action.maxAgentsDistance > 0.0f)
-                    {
-                        for (int i = 0; i < agentManager.agents.Count; i++)
-                        {
+                if (!action.forceAction) {
+                    if (action.maxAgentsDistance > 0.0f) {
+                        for (int i = 0; i < agentManager.agents.Count; i++) {
                             if (
                                 (
                                     (PhysicsRemoteFPSAgentController)agentManager.agents[i]
                                 ).distanceToObject(sop) > action.maxAgentsDistance
-                            )
-                            {
+                            ) {
                                 sop.transform.rotation = oldRotation;
                                 errorMessage =
                                     "Would move object beyond max distance from agent "
@@ -1645,15 +1416,13 @@ public void RotateLiftedObjectRight(ServerAction action)
                             }
                         }
                     }
-                    if (UtilityFunctions.isObjectColliding(sop.gameObject, null, 0.0f))
-                    {
+                    if (UtilityFunctions.isObjectColliding(sop.gameObject, null, 0.0f)) {
                         sop.transform.rotation = oldRotation;
                         errorMessage = sop.ObjectID + " is colliding after teleport.";
                         actionFinished(false);
                         return;
                     }
-                    foreach (BaseFPSAgentController agent in agentManager.agents)
-                    {
+                    foreach (BaseFPSAgentController agent in agentManager.agents) {
                         // This check is silly but seems necessary to appease unity
                         // as unity doesn't realize the object collides with the agents in
                         // the above checks in some cases.
@@ -1661,8 +1430,7 @@ public void RotateLiftedObjectRight(ServerAction action)
                             ((PhysicsRemoteFPSAgentController)agent).isAgentCapsuleCollidingWith(
                                 sop.gameObject
                             )
-                        )
-                        {
+                        ) {
                             sop.transform.rotation = oldRotation;
                             errorMessage =
                                 sop.ObjectID + " is colliding with an agent after rotation.";
@@ -1679,12 +1447,10 @@ public bool moveAgentsWithObject(
             SimObjPhysics objectToMove,
             Vector3 d,
             bool snapToGrid = true
-        )
-        {
+        ) {
             List<Vector3> startAgentPositions = new List<Vector3>();
             var agentMovePQ = new SimplePriorityQueue<BaseFPSAgentController>();
-            foreach (BaseFPSAgentController agent in agentManager.agents)
-            {
+            foreach (BaseFPSAgentController agent in agentManager.agents) {
                 var p = agent.transform.position;
                 startAgentPositions.Add(p);
                 agentMovePQ.Enqueue(agent, -(d.x * p.x + d.z * p.z));
@@ -1694,24 +1460,19 @@ public bool moveAgentsWithObject(
             bool objectMoved = false;
 
             HashSet<Collider> agentsAndObjColliders = new HashSet<Collider>();
-            foreach (BaseFPSAgentController agent in agentManager.agents)
-            {
-                foreach (Collider c in agent.GetComponentsInChildren<Collider>())
-                {
+            foreach (BaseFPSAgentController agent in agentManager.agents) {
+                foreach (Collider c in agent.GetComponentsInChildren<Collider>()) {
                     agentsAndObjColliders.Add(c);
                 }
             }
-            foreach (Collider c in objectToMove.GetComponentsInChildren<Collider>())
-            {
+            foreach (Collider c in objectToMove.GetComponentsInChildren<Collider>()) {
                 agentsAndObjColliders.Add(c);
             }
 
             bool success = true;
             Physics.autoSimulation = false;
-            while (agentMovePQ.Count > 0 || !objectMoved)
-            {
-                if (agentMovePQ.Count == 0)
-                {
+            while (agentMovePQ.Count > 0 || !objectMoved) {
+                if (agentMovePQ.Count == 0) {
                     success = moveObjectWithTeleport(
                         objectToMove,
                         objectToMove.transform.position + d,
@@ -1719,15 +1480,12 @@ public bool moveAgentsWithObject(
                     );
                     PhysicsSceneManager.PhysicsSimulateTHOR(0.04f);
                     break;
-                }
-                else
-                {
+                } else {
                     PhysicsRemoteFPSAgentController nextAgent = (PhysicsRemoteFPSAgentController)
                         agentMovePQ.First;
                     float agentPriority = -agentMovePQ.GetPriority(nextAgent);
 
-                    if (!objectMoved && agentPriority < objectPriority)
-                    {
+                    if (!objectMoved && agentPriority < objectPriority) {
                         // Debug.Log("Object");
                         success = moveObjectWithTeleport(
                             objectToMove,
@@ -1736,9 +1494,7 @@ public bool moveAgentsWithObject(
                         );
                         PhysicsSceneManager.PhysicsSimulateTHOR(0.04f);
                         objectMoved = true;
-                    }
-                    else
-                    {
+                    } else {
                         // Debug.Log(nextAgent);
                         agentMovePQ.Dequeue();
                         success = nextAgent.moveInDirection(
@@ -1752,16 +1508,13 @@ public bool moveAgentsWithObject(
                         PhysicsSceneManager.PhysicsSimulateTHOR(0.04f);
                     }
                 }
-                if (!success)
-                {
+                if (!success) {
                     break;
                 }
             }
             Physics.autoSimulation = true;
-            if (!success)
-            {
-                for (int i = 0; i < agentManager.agents.Count; i++)
-                {
+            if (!success) {
+                for (int i = 0; i < agentManager.agents.Count; i++) {
                     agentManager.agents[i].transform.position = startAgentPositions[i];
                 }
                 objectToMove.transform.position = startObjectPosition;
@@ -1769,10 +1522,8 @@ public bool moveAgentsWithObject(
             return success;
         }
 
-        public void MoveAgentsAheadWithObject(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void MoveAgentsAheadWithObject(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
@@ -1786,10 +1537,8 @@ public void MoveAgentsAheadWithObject(ServerAction action)
             );
         }
 
-        public void MoveAgentsLeftWithObject(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void MoveAgentsLeftWithObject(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
@@ -1803,10 +1552,8 @@ public void MoveAgentsLeftWithObject(ServerAction action)
             );
         }
 
-        public void MoveAgentsRightWithObject(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void MoveAgentsRightWithObject(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
@@ -1820,10 +1567,8 @@ public void MoveAgentsRightWithObject(ServerAction action)
             );
         }
 
-        public void MoveAgentsBackWithObject(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void MoveAgentsBackWithObject(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
@@ -1837,41 +1582,32 @@ public void MoveAgentsBackWithObject(ServerAction action)
             );
         }
 
-        public void TeleportObjectToFloor(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void TeleportObjectToFloor(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
-                if (ItemInHand != null && sop == ItemInHand.GetComponent<SimObjPhysics>())
-                {
+                if (ItemInHand != null && sop == ItemInHand.GetComponent<SimObjPhysics>()) {
                     errorMessage = "Cannot teleport object in hand.";
                     actionFinished(false);
                     return;
                 }
 
                 Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
-                foreach (Renderer r in sop.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in sop.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         objBounds.Encapsulate(r.bounds);
                     }
                 }
-                if (objBounds.min.x == float.PositiveInfinity)
-                {
+                if (objBounds.min.x == float.PositiveInfinity) {
                     errorMessage = "Could not get bounds of " + action.objectId + ".";
                     actionFinished(false);
                     return;
                 }
                 float y = getFloorY(action.x, action.z);
-                if (errorMessage != "")
-                {
+                if (errorMessage != "") {
                     actionFinished(false);
                     return;
                 }
@@ -1918,8 +1654,7 @@ public void TeleportFull(
             float? horizon,
             bool? standing,
             bool forceAction = false
-        )
-        {
+        ) {
             TeleportFull(
                 position: new Vector3(x, y, z),
                 rotation: rotation,
@@ -1953,8 +1688,7 @@ public virtual void TeleportFull(
             float? horizon,
             bool? standing,
             bool forceAction = false
-        )
-        {
+        ) {
             Debug.Log($"------- Teleport Full physicsFPS type {this.GetType()}");
             // cache old values in case there's a failure
             bool wasStanding = isStanding();
@@ -1964,14 +1698,12 @@ public virtual void TeleportFull(
 
             Vector3 oldLocalHandPosition = new Vector3();
             Quaternion oldLocalHandRotation = new Quaternion();
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 oldLocalHandPosition = ItemInHand.transform.localPosition;
                 oldLocalHandRotation = ItemInHand.transform.localRotation;
             }
 
-            try
-            {
+            try {
                 // default high level hand when teleporting
                 DefaultAgentHand();
                 base.teleportFull(
@@ -1981,54 +1713,39 @@ public virtual void TeleportFull(
                     forceAction: forceAction
                 );
 
-                if (standing.HasValue)
-                {
-                    if (standing.Value)
-                    {
+                if (standing.HasValue) {
+                    if (standing.Value) {
                         stand();
-                    }
-                    else
-                    {
+                    } else {
                         crouch();
                     }
                 }
 
                 // add arm value cases
-                if (!forceAction)
-                {
-                    if (isHandObjectColliding(ignoreAgent: true))
-                    {
+                if (!forceAction) {
+                    if (isHandObjectColliding(ignoreAgent: true)) {
                         throw new InvalidOperationException(
                             "Cannot teleport due to hand object collision."
                         );
                     }
-                    if (Arm != null && Arm.IsArmColliding())
-                    {
+                    if (Arm != null && Arm.IsArmColliding()) {
                         throw new InvalidOperationException(
                             "Mid Level Arm is actively clipping with some geometry in the environment. TeleportFull fails in this position."
                         );
-                    }
-                    else if (SArm != null && SArm.IsArmColliding())
-                    {
+                    } else if (SArm != null && SArm.IsArmColliding()) {
                         throw new InvalidOperationException(
                             "Stretch Arm is actively clipping with some geometry in the environment. TeleportFull fails in this position."
                         );
                     }
                     base.assertTeleportedNearGround(targetPosition: position);
                 }
-            }
-            catch (InvalidOperationException e)
-            {
-                if (wasStanding)
-                {
+            } catch (InvalidOperationException e) {
+                if (wasStanding) {
                     stand();
-                }
-                else
-                {
+                } else {
                     crouch();
                 }
-                if (ItemInHand != null)
-                {
+                if (ItemInHand != null) {
                     ItemInHand.transform.localPosition = oldLocalHandPosition;
                     ItemInHand.transform.localRotation = oldLocalHandRotation;
                 }
@@ -2075,8 +1792,7 @@ public void Teleport(
             float? horizon = null,
             bool? standing = null,
             bool forceAction = false
-        )
-        {
+        ) {
             Teleport(
                 position: new Vector3(x, y, z),
                 rotation: rotation,
@@ -2110,8 +1826,7 @@ public void Teleport(
             float? horizon = null,
             bool? standing = null,
             bool forceAction = false
-        )
-        {
+        ) {
             TeleportFull(
                 position: position == null ? transform.position : (Vector3)position,
                 rotation: rotation == null ? transform.eulerAngles : (Vector3)rotation,
@@ -2121,29 +1836,22 @@ public void Teleport(
             );
         }
 
-        public void ToggleArmColliders(IK_Robot_Arm_Controller arm, bool value)
-        {
-            if (arm != null)
-            {
-                foreach (CapsuleCollider c in arm.ArmCapsuleColliders)
-                {
+        public void ToggleArmColliders(IK_Robot_Arm_Controller arm, bool value) {
+            if (arm != null) {
+                foreach (CapsuleCollider c in arm.ArmCapsuleColliders) {
                     c.isTrigger = value;
                 }
-                foreach (BoxCollider b in arm.ArmBoxColliders)
-                {
+                foreach (BoxCollider b in arm.ArmBoxColliders) {
                     b.isTrigger = value;
                 }
             }
         }
 
-        protected HashSet<Collider> allAgentColliders()
-        {
+        protected HashSet<Collider> allAgentColliders() {
             HashSet<Collider> colliders = null;
             colliders = new HashSet<Collider>();
-            foreach (BaseFPSAgentController agent in agentManager.agents)
-            {
-                foreach (Collider c in agent.GetComponentsInChildren<Collider>())
-                {
+            foreach (BaseFPSAgentController agent in agentManager.agents) {
+                foreach (Collider c in agent.GetComponentsInChildren<Collider>()) {
                     colliders.Add(c);
                 }
             }
@@ -2161,14 +1869,10 @@ public virtual void MoveLeft(
             float? fixedDeltaTime = null, // TODO: Unused, remove when refactoring the controllers
             bool returnToStart = true, // TODO: Unused, remove when refactoring the controllers
             bool disableRendering = true // TODO: Unused, remove when refactoring the controllers
-        )
-        {
-            if (!moveMagnitude.HasValue)
-            {
+        ) {
+            if (!moveMagnitude.HasValue) {
                 moveMagnitude = gridSize;
-            }
-            else if (moveMagnitude <= 0f)
-            {
+            } else if (moveMagnitude <= 0f) {
                 throw new InvalidOperationException("moveMagnitude must be > 0");
             }
 
@@ -2191,15 +1895,11 @@ public virtual void MoveRight(
             bool forceAction = false,
             bool manualInteract = false,
             bool allowAgentsToIntersect = false
-        )
-        {
+        ) {
             Debug.Log("MoveRight at physics fps? call ");
-            if (!moveMagnitude.HasValue)
-            {
+            if (!moveMagnitude.HasValue) {
                 moveMagnitude = gridSize;
-            }
-            else if (moveMagnitude <= 0f)
-            {
+            } else if (moveMagnitude <= 0f) {
                 throw new InvalidOperationException("moveMagnitude must be > 0");
             }
 
@@ -2222,14 +1922,10 @@ public virtual void MoveAhead(
             bool forceAction = false,
             bool manualInteract = false,
             bool allowAgentsToIntersect = false
-        )
-        {
-            if (!moveMagnitude.HasValue)
-            {
+        ) {
+            if (!moveMagnitude.HasValue) {
                 moveMagnitude = gridSize;
-            }
-            else if (moveMagnitude <= 0f)
-            {
+            } else if (moveMagnitude <= 0f) {
                 throw new InvalidOperationException("moveMagnitude must be > 0");
             }
 
@@ -2256,14 +1952,10 @@ public virtual void MoveBack(
             float? fixedDeltaTime = null, // TODO: Unused, remove when refactoring the controllers
             bool returnToStart = true, // TODO: Unused, remove when refactoring the controllers
             bool disableRendering = true // TODO: Unused, remove when refactoring the controllers
-        )
-        {
-            if (!moveMagnitude.HasValue)
-            {
+        ) {
+            if (!moveMagnitude.HasValue) {
                 moveMagnitude = gridSize;
-            }
-            else if (moveMagnitude <= 0f)
-            {
+            } else if (moveMagnitude <= 0f) {
                 throw new InvalidOperationException("moveMagnitude must be > 0");
             }
 
@@ -2280,18 +1972,15 @@ public virtual void MoveBack(
         }
 
         // a no op action used to return metadata via actionFinished call, but not actually doing anything to interact with the scene or manipulate the Agent
-        public void NoOp()
-        {
+        public void NoOp() {
             actionFinished(true);
         }
 
-        public void PushObject(ServerAction action)
-        {
+        public void PushObject(ServerAction action) {
             if (
                 ItemInHand != null
                 && action.objectId == ItemInHand.GetComponent<SimObjPhysics>().objectID
-            )
-            {
+            ) {
                 errorMessage = "Please use Throw for an item in the Agent's Hand";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -2307,13 +1996,11 @@ public void PushObject(ServerAction action)
             ApplyForceObject(action);
         }
 
-        public void PullObject(ServerAction action)
-        {
+        public void PullObject(ServerAction action) {
             if (
                 ItemInHand != null
                 && action.objectId == ItemInHand.GetComponent<SimObjPhysics>().objectID
-            )
-            {
+            ) {
                 errorMessage = "Please use Throw for an item in the Agent's Hand";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -2330,13 +2017,11 @@ public void PullObject(ServerAction action)
         }
 
         // pass in a magnitude and an angle offset to push an object relative to agent forward
-        public void DirectionalPush(ServerAction action)
-        {
+        public void DirectionalPush(ServerAction action) {
             if (
                 ItemInHand != null
                 && action.objectId == ItemInHand.GetComponent<SimObjPhysics>().objectID
-            )
-            {
+            ) {
                 errorMessage = "Please use Throw for an item in the Agent's Hand";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -2348,27 +2033,22 @@ public void DirectionalPush(ServerAction action)
             action.pushAngle %= 360;
 
             // converts negative rotations to be positive
-            if (action.pushAngle < 360)
-            {
+            if (action.pushAngle < 360) {
                 action.pushAngle += 360;
             }
 
-            if (action.forceAction)
-            {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
@@ -2388,15 +2068,13 @@ public void DirectionalPush(ServerAction action)
             if (
                 target.PrimaryProperty != SimObjPrimaryProperty.CanPickup
                 && target.PrimaryProperty != SimObjPrimaryProperty.Moveable
-            )
-            {
+            ) {
                 throw new InvalidOperationException(
                     "Target Primary Property type incompatible with push/pull"
                 );
             }
 
-            if (!action.forceAction && !IsInteractable(target))
-            {
+            if (!action.forceAction && !IsInteractable(target)) {
                 errorMessage = "Target is not interactable and is probably occluded by something!";
                 actionFinished(false);
                 return;
@@ -2430,24 +2108,19 @@ public void DirectionalPush(ServerAction action)
             // actionFinished(true);
         }
 
-        public void ApplyForceObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void ApplyForceObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
@@ -2459,21 +2132,18 @@ public void ApplyForceObject(ServerAction action)
             if (
                 target.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                 || target.PrimaryProperty == SimObjPrimaryProperty.Moveable
-            )
-            {
+            ) {
                 canbepushed = true;
             }
 
-            if (!canbepushed)
-            {
+            if (!canbepushed) {
                 errorMessage =
                     "Target Sim Object cannot be moved. It's primary property must be Pickupable or Moveable";
                 actionFinished(false);
                 return;
             }
 
-            if (!action.forceAction && !IsInteractable(target))
-            {
+            if (!action.forceAction && !IsInteractable(target)) {
                 errorMessage =
                     "Target:"
                     + target.objectID
@@ -2489,13 +2159,11 @@ public void ApplyForceObject(ServerAction action)
 
             Vector3 dir = Vector3.zero;
 
-            if (action.z == 1)
-            {
+            if (action.z == 1) {
                 dir = gameObject.transform.forward;
             }
 
-            if (action.z == -1)
-            {
+            if (action.z == -1) {
                 dir = -gameObject.transform.forward;
             }
             // Vector3 dir = gameObject.transform.forward;
@@ -2509,27 +2177,21 @@ public void ApplyForceObject(ServerAction action)
             // actionFinished(true);
         }
 
-        public IEnumerator SimulatePhysics(int steps)
-        {
-            for (var i = 0; i < steps; i++)
-            {
+        public IEnumerator SimulatePhysics(int steps) {
+            for (var i = 0; i < steps; i++) {
                 yield return new WaitForFixedUpdate();
             }
             yield return ActionFinished.Success;
         }
 
-        protected void sopApplyForce(ServerAction action, SimObjPhysics sop, float length)
-        {
+        protected void sopApplyForce(ServerAction action, SimObjPhysics sop, float length) {
             // print("running sopApplyForce");
             // apply force, return action finished immediately
-            if (physicsSceneManager.physicsSimulationPaused)
-            {
+            if (physicsSceneManager.physicsSimulationPaused) {
                 // print("autosimulation off");
                 sop.ApplyForce(action);
-                if (length >= 0.00001f)
-                {
-                    WhatDidITouch feedback = new WhatDidITouch()
-                    {
+                if (length >= 0.00001f) {
+                    WhatDidITouch feedback = new WhatDidITouch() {
                         didHandTouchSomething = true,
                         objectId = sop.objectID,
                         armsLength = length
@@ -2542,14 +2204,12 @@ protected void sopApplyForce(ServerAction action, SimObjPhysics sop, float lengt
                     actionFinished(true, feedback);
                 }
                 // why is this here?
-                else
-                {
+                else {
                     actionFinished(true);
                 }
             }
             // if physics is automatically being simulated, use coroutine rather than returning actionFinished immediately
-            else
-            {
+            else {
                 // print("autosimulation true");
                 sop.ApplyForce(action);
                 StartCoroutine(checkIfObjectHasStoppedMoving(sop: sop, length: length));
@@ -2563,28 +2223,23 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
             SimObjPhysics sop,
             float length,
             bool useTimeout = false
-        )
-        {
+        ) {
             // yield for the physics update to make sure this yield is consistent regardless of framerate
             yield return new WaitForFixedUpdate();
 
             float startTime = Time.time;
             float waitTime = TimeToWaitForObjectsToComeToRest;
 
-            if (useTimeout)
-            {
+            if (useTimeout) {
                 waitTime = 1.0f;
             }
 
-            if (sop != null)
-            {
+            if (sop != null) {
                 Rigidbody rb = sop.GetComponentInChildren<Rigidbody>();
                 bool stoppedMoving = false;
 
-                while (Time.time - startTime < waitTime)
-                {
-                    if (sop == null)
-                    {
+                while (Time.time - startTime < waitTime) {
+                    if (sop == null) {
                         break;
                     }
 
@@ -2594,24 +2249,20 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
                     float accel = (currentVelocity - sop.lastVelocity) / Time.fixedDeltaTime;
 
                     // ok the accel is basically zero, so it has stopped moving
-                    if (Mathf.Abs(accel) <= 0.001f)
-                    {
+                    if (Mathf.Abs(accel) <= 0.001f) {
                         // force the rb to stop moving just to be safe
                         rb.velocity = Vector3.zero;
                         rb.angularVelocity = Vector3.zero;
                         rb.Sleep();
                         stoppedMoving = true;
                         break;
-                    }
-                    else
-                    {
+                    } else {
                         yield return new WaitForFixedUpdate();
                     }
                 }
 
                 // so we never stopped moving and we are using the timeout
-                if (!stoppedMoving && useTimeout)
-                {
+                if (!stoppedMoving && useTimeout) {
                     errorMessage = "object couldn't come to rest";
                     // print(errorMessage);
                     actionFinished(false);
@@ -2619,8 +2270,7 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
                 }
 
                 // return to metadatawrapper.actionReturn if an object was touched during this interaction
-                WhatDidITouch feedback = new WhatDidITouch()
-                {
+                WhatDidITouch feedback = new WhatDidITouch() {
                     didHandTouchSomething = true,
                     objectId = sop.objectID,
                     armsLength = length
@@ -2639,17 +2289,14 @@ protected IEnumerator checkIfObjectHasStoppedMoving(
                 rb.Sleep();
 
                 actionFinished(true, feedback);
-            }
-            else
-            {
+            } else {
                 errorMessage = "null reference sim obj in checkIfObjectHasStoppedMoving call";
                 actionFinished(false);
             }
         }
 
         // wrapping the SimObjPhysics.ApplyForce function since lots of things use it....
-        protected void sopApplyForce(ServerAction action, SimObjPhysics sop)
-        {
+        protected void sopApplyForce(ServerAction action, SimObjPhysics sop) {
             sopApplyForce(action, sop, 0.0f);
         }
 
@@ -2657,28 +2304,23 @@ private IEnumerator checkIfAllObjectsHaveStoppedMoving(
             float length,
             double squaredAccelerationEpsilon = 1e-3,
             bool useTimeout = false
-        )
-        {
+        ) {
             // yield for the physics update to make sure this yield is consistent regardless of framerate
             yield return new WaitForFixedUpdate();
 
             float startTime = Time.time;
             float waitTime = TimeToWaitForObjectsToComeToRest;
 
-            if (useTimeout)
-            {
+            if (useTimeout) {
                 waitTime = 1.0f;
             }
 
-            foreach (var sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+            foreach (var sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 Rigidbody rb = sop.GetComponentInChildren<Rigidbody>();
                 bool stoppedMoving = false;
 
-                while (Time.time - startTime < waitTime)
-                {
-                    if (sop == null)
-                    {
+                while (Time.time - startTime < waitTime) {
+                    if (sop == null) {
                         break;
                     }
 
@@ -2689,24 +2331,20 @@ private IEnumerator checkIfAllObjectsHaveStoppedMoving(
                         / (Time.fixedDeltaTime * Time.fixedDeltaTime);
 
                     // ok the accel is basically zero, so it has stopped moving
-                    if (Mathf.Abs(squaredAccel) <= squaredAccelerationEpsilon)
-                    {
+                    if (Mathf.Abs(squaredAccel) <= squaredAccelerationEpsilon) {
                         // force the rb to stop moving just to be safe
                         rb.velocity = Vector3.zero;
                         rb.angularVelocity = Vector3.zero;
                         rb.Sleep();
                         stoppedMoving = true;
                         break;
-                    }
-                    else
-                    {
+                    } else {
                         yield return new WaitForFixedUpdate();
                     }
                 }
 
                 // so we never stopped moving and we are using the timeout
-                if (!stoppedMoving && useTimeout)
-                {
+                if (!stoppedMoving && useTimeout) {
                     errorMessage = "object couldn't come to rest";
                     // print(errorMessage);
                     actionFinished(false);
@@ -2719,10 +2357,8 @@ private IEnumerator checkIfAllObjectsHaveStoppedMoving(
                 // rb.Sleep();
 
                 // return to metadatawrapper.actionReturn if an object was touched during this interaction
-                if (length != 0.0f)
-                {
-                    WhatDidITouch feedback = new WhatDidITouch()
-                    {
+                if (length != 0.0f) {
+                    WhatDidITouch feedback = new WhatDidITouch() {
                         didHandTouchSomething = true,
                         objectId = sop.objectID,
                         armsLength = length
@@ -2743,8 +2379,7 @@ private IEnumerator checkIfAllObjectsHaveStoppedMoving(
                     actionFinished(true, feedback);
                 }
                 // if passed in length is 0, don't return feedback cause not all actions need that
-                else
-                {
+                else {
                     DefaultAgentHand();
                     actionFinished(true, sop.transform.position);
                 }
@@ -2752,27 +2387,21 @@ private IEnumerator checkIfAllObjectsHaveStoppedMoving(
         }
 
         // Sweeptest to see if the object Agent is holding will prohibit movement
-        public bool CheckIfItemBlocksAgentStandOrCrouch()
-        {
+        public bool CheckIfItemBlocksAgentStandOrCrouch() {
             bool result = false;
 
             // if there is nothing in our hand, we are good, return!
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 result = true;
                 return result;
             }
             // otherwise we are holding an object and need to do a sweep using that object's rb
-            else
-            {
+            else {
                 Vector3 dir = new Vector3();
 
-                if (isStanding())
-                {
+                if (isStanding()) {
                     dir = new Vector3(0.0f, -1f, 0.0f);
-                }
-                else
-                {
+                } else {
                     dir = new Vector3(0.0f, 1f, 0.0f);
                 }
 
@@ -2783,21 +2412,16 @@ public bool CheckIfItemBlocksAgentStandOrCrouch()
                     standingLocalCameraPosition.y,
                     QueryTriggerInteraction.Ignore
                 );
-                if (sweepResults.Length > 0)
-                {
-                    foreach (RaycastHit res in sweepResults)
-                    {
+                if (sweepResults.Length > 0) {
+                    foreach (RaycastHit res in sweepResults) {
                         // did the item in the hand touch the agent? if so, ignore it's fine
                         // also ignore Untagged because the Transparent_RB of transparent objects need to be ignored for movement
                         // the actual rigidbody of the SimObjPhysics parent object of the transparent_rb should block correctly by having the
                         // checkMoveAction() in the BaseFPSAgentController fail when the agent collides and gets shoved back
-                        if (res.transform.tag == "Player" || res.transform.tag == "Untagged")
-                        {
+                        if (res.transform.tag == "Player" || res.transform.tag == "Untagged") {
                             result = true;
                             break;
-                        }
-                        else
-                        {
+                        } else {
                             errorMessage =
                                 res.transform.name
                                 + " is blocking the Agent from moving "
@@ -2811,8 +2435,7 @@ public bool CheckIfItemBlocksAgentStandOrCrouch()
                     }
                 }
                 // if the array is empty, nothing was hit by the sweeptest so we are clear to move
-                else
-                {
+                else {
                     result = true;
                 }
 
@@ -2826,10 +2449,8 @@ protected IEnumerator moveHandToTowardsXYZWithForce(
             float y,
             float z,
             float maxDistance
-        )
-        {
-            if (ItemInHand == null)
-            {
+        ) {
+            if (ItemInHand == null) {
                 errorMessage = "Agent can only move hand if holding an item";
                 actionFinished(false);
                 yield break;
@@ -2862,12 +2483,10 @@ float maxDistance
             Physics.autoSimulation = false;
             List<Vector3> seenPositions = new List<Vector3>();
             List<Quaternion> seenRotations = new List<Quaternion>();
-            for (int i = 0; i < 100; i++)
-            {
+            for (int i = 0; i < 100; i++) {
                 seenPositions.Add(rb.transform.position);
                 seenRotations.Add(rb.transform.rotation);
-                if (rb.velocity.magnitude < 1)
-                {
+                if (rb.velocity.magnitude < 1) {
                     rb.AddForce(forceDirection, ForceMode.Force);
                 }
                 rb.angularVelocity = rb.angularVelocity * 0.96f;
@@ -2877,25 +2496,21 @@ float maxDistance
                 yield return null;
 #endif
 
-                if (i >= 5)
-                {
+                if (i >= 5) {
                     bool repeatedPosition = false;
                     for (
                         int j = seenPositions.Count - 4;
                         j >= Math.Max(seenPositions.Count - 8, 0);
                         j--
-                    )
-                    {
+                    ) {
                         float distance = Vector3.Distance(rb.transform.position, seenPositions[i]);
                         float angle = Quaternion.Angle(rb.transform.rotation, seenRotations[i]);
-                        if (distance <= 0.001f && angle <= 3f)
-                        {
+                        if (distance <= 0.001f && angle <= 3f) {
                             repeatedPosition = true;
                             break;
                         }
                     }
-                    if (repeatedPosition)
-                    {
+                    if (repeatedPosition) {
                         break;
                     }
                 }
@@ -2907,8 +2522,7 @@ float maxDistance
                 Vector3 forceDir = Vector3.Project(newPosition - initialPosition, forceDirection);
                 Vector3 perpDir = delta - forceDir;
                 float perpNorm = perpDir.magnitude;
-                if (perpNorm > 0.1f * maxDistance)
-                {
+                if (perpNorm > 0.1f * maxDistance) {
                     newPosition =
                         initialPosition + forceDir + (0.1f * maxDistance) * perpDir / perpNorm;
                     rb.transform.position = newPosition;
@@ -2924,19 +2538,15 @@ float maxDistance
                 leavingViewport = !objectIsWithinViewport(simObjInHand);
                 // leavingViewport = !objectIsCurrentlyVisible(simObjInHand, 1000f);
 
-                if (hitMaxDistance)
-                {
+                if (hitMaxDistance) {
                     rb.velocity = new Vector3(0f, 0f, 0f);
                     rb.angularVelocity = 0.0f * rb.angularVelocity;
                     break;
                 }
 
-                if (beyondVisibleDistance || leavingViewport)
-                {
+                if (beyondVisibleDistance || leavingViewport) {
                     break;
-                }
-                else
-                {
+                } else {
                     positions.Add(rb.transform.position);
                     rotations.Add(rb.transform.rotation);
                     lastPosition = rb.transform.position;
@@ -2949,17 +2559,14 @@ float maxDistance
             int count = 0;
             foreach (
                 KeyValuePair<Collider, ContactPoint[]> pair in simObjInHand.contactPointsDictionary
-            )
-            {
-                foreach (ContactPoint cp in pair.Value)
-                {
+            ) {
+                foreach (ContactPoint cp in pair.Value) {
                     normalSum += cp.normal;
                     count += 1;
                 }
             }
 
-            if (count != 0)
-            {
+            if (count != 0) {
                 aveCollisionsNormal = normalSum / count;
                 aveCollisionsNormal.Normalize();
             }
@@ -2975,10 +2582,8 @@ KeyValuePair<Collider, ContactPoint[]> pair in simObjInHand.contactPointsDiction
 
             PhysicsSceneManager.PhysicsSimulateTHOR(0.1f);
             bool handObjectIsColliding = isHandObjectColliding(true);
-            if (count != 0)
-            {
-                for (int j = 0; handObjectIsColliding && j < 5; j++)
-                {
+            if (count != 0) {
+                for (int j = 0; handObjectIsColliding && j < 5; j++) {
                     AgentHand.transform.position =
                         AgentHand.transform.position + 0.01f * aveCollisionsNormal;
                     PhysicsSceneManager.PhysicsSimulateTHOR(0.1f);
@@ -2993,8 +2598,7 @@ KeyValuePair<Collider, ContactPoint[]> pair in simObjInHand.contactPointsDiction
             rb.isKinematic = true;
             rb.collisionDetectionMode = oldCollisionDetectionMode;
 
-            if (handObjectIsColliding)
-            {
+            if (handObjectIsColliding) {
                 AgentHand.transform.position = initialPosition;
                 rb.transform.rotation = initialRotation;
                 errorMessage = "Hand object was colliding with: ";
@@ -3003,53 +2607,38 @@ KeyValuePair<Collider, ContactPoint[]> pair in simObjInHand.contactPointsDiction
                         Collider,
                         ContactPoint[]
                     > pair in simObjInHand.contactPointsDictionary
-                )
-                {
+                ) {
                     SimObjPhysics sop = ancestorSimObjPhysics(pair.Key.gameObject);
-                    if (sop != null)
-                    {
+                    if (sop != null) {
                         errorMessage += "" + sop.ObjectID + ", ";
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage += "" + pair.Key.gameObject.name + ", ";
                     }
                 }
                 errorMessage += " object(s) after movement.";
                 actionFinished(false);
-            }
-            else if (
-                Vector3.Distance(initialPosition, lastPosition) < 0.001f
-                && Quaternion.Angle(initialRotation, lastRotation) < 0.001f
-            )
-            {
-                if (beyondVisibleDistance)
-                {
+            } else if (
+                  Vector3.Distance(initialPosition, lastPosition) < 0.001f
+                  && Quaternion.Angle(initialRotation, lastRotation) < 0.001f
+              ) {
+                if (beyondVisibleDistance) {
                     errorMessage = "Hand already at max distance.";
-                }
-                else if (leavingViewport)
-                {
+                } else if (leavingViewport) {
                     errorMessage = "Hand at viewport constraints.";
-                }
-                else
-                {
+                } else {
                     errorMessage = "Hand object did not move, perhaps its being blocked.";
                 }
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 actionFinished(true);
             }
         }
 
-        public void OpenWithHand(ServerAction action)
-        {
+        public void OpenWithHand(ServerAction action) {
             Vector3 direction =
                 transform.forward * action.z + transform.right * action.x + transform.up * action.y;
             direction.Normalize();
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.SetActive(false);
             }
             RaycastHit hit;
@@ -3068,44 +2657,33 @@ public void OpenWithHand(ServerAction action)
                 10f,
                 layerMask
             );
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.SetActive(true);
             }
 
-            if (!raycastDidHit)
-            {
+            if (!raycastDidHit) {
                 errorMessage = "No openable objects in direction.";
                 actionFinished(false);
                 return;
             }
             SimObjPhysics so = ancestorSimObjPhysics(hit.transform.gameObject);
-            if (so != null)
-            {
+            if (so != null) {
                 OpenObject(objectId: so.ObjectID, forceAction: true);
-            }
-            else
-            {
+            } else {
                 errorMessage = hit.transform.gameObject.name + " is not interactable.";
                 actionFinished(false);
             }
         }
 
-        public void MoveHandForce(float x, float y, float z)
-        {
+        public void MoveHandForce(float x, float y, float z) {
             Vector3 direction = transform.forward * z + transform.right * x + transform.up * y;
             Vector3 target = AgentHand.transform.position + direction;
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 Debug.Log("Agent can only move hand if holding an item");
                 actionFinished(false);
-            }
-            else if (moveHandToXYZ(target.x, target.y, target.z))
-            {
+            } else if (moveHandToXYZ(target.x, target.y, target.z)) {
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "";
                 StartCoroutine(
                     moveHandToTowardsXYZWithForce(target.x, target.y, target.z, direction.magnitude)
@@ -3113,8 +2691,7 @@ public void MoveHandForce(float x, float y, float z)
             }
         }
 
-        public void TouchThenApplyForce(ServerAction action)
-        {
+        public void TouchThenApplyForce(ServerAction action) {
             float x = action.x;
             float y = 1.0f - action.y; // reverse the y so that the origin (0, 0) can be passed in as the top left of the screen
 
@@ -3139,27 +2716,21 @@ public void TouchThenApplyForce(ServerAction action)
                     ),
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
-                if (hit.transform.GetComponent<SimObjPhysics>())
-                {
+            ) {
+                if (hit.transform.GetComponent<SimObjPhysics>()) {
                     // wait! First check if the point hit is withing visibility bounds (camera viewport, max distance etc)
                     // this should basically only happen if the handDistance value is too big
-                    try
-                    {
+                    try {
                         assertPosInView(
                             targetPosition: hit.point,
                             inMaxVisibleDistance: true,
                             inViewport: true
                         );
-                    }
-                    catch (InvalidOperationException e)
-                    {
+                    } catch (InvalidOperationException e) {
                         actionFinished(
                             success: false,
                             errorMessage: "Object successfully hit, but it is outside of the Agent's interaction range",
-                            actionReturn: new WhatDidITouch()
-                            {
+                            actionReturn: new WhatDidITouch() {
                                 didHandTouchSomething = false,
                                 objectId = "",
                                 armsLength = action.handDistance
@@ -3175,16 +2746,13 @@ public void TouchThenApplyForce(ServerAction action)
                     if (
                         target.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                         || target.PrimaryProperty == SimObjPrimaryProperty.Moveable
-                    )
-                    {
+                    ) {
                         canbepushed = true;
                     }
 
-                    if (!canbepushed)
-                    {
+                    if (!canbepushed) {
                         // the sim object hit was not moveable or pickupable
-                        WhatDidITouch feedback = new WhatDidITouch()
-                        {
+                        WhatDidITouch feedback = new WhatDidITouch() {
                             didHandTouchSomething = true,
                             objectId = target.objectID,
                             armsLength = hit.distance
@@ -3212,10 +2780,8 @@ public void TouchThenApplyForce(ServerAction action)
                     sopApplyForce(apply, target, hit.distance);
                 }
                 // raycast hit something but it wasn't a sim object
-                else
-                {
-                    WhatDidITouch feedback = new WhatDidITouch()
-                    {
+                else {
+                    WhatDidITouch feedback = new WhatDidITouch() {
                         didHandTouchSomething = true,
                         objectId = "not a sim object, a structure was touched",
                         armsLength = hit.distance
@@ -3231,26 +2797,21 @@ public void TouchThenApplyForce(ServerAction action)
                 }
             }
             // raycast didn't hit anything
-            else
-            {
+            else {
                 // get ray.origin, multiply handDistance with ray.direction, add to origin to get the final point
                 // if the final point was out of range, return actionFinished false, otherwise return actionFinished true with feedback
                 Vector3 testPosition = ((action.handDistance * ray.direction) + ray.origin);
-                try
-                {
+                try {
                     assertPosInView(
                         targetPosition: testPosition,
                         inMaxVisibleDistance: true,
                         inViewport: true
                     );
-                }
-                catch (InvalidOperationException e)
-                {
+                } catch (InvalidOperationException e) {
                     actionFinished(
                         success: false,
                         errorMessage: "Object successfully hit, but it is outside of the Agent's interaction range",
-                        actionReturn: new WhatDidITouch()
-                        {
+                        actionReturn: new WhatDidITouch() {
                             didHandTouchSomething = false,
                             objectId = "",
                             armsLength = action.handDistance
@@ -3260,8 +2821,7 @@ public void TouchThenApplyForce(ServerAction action)
                 }
 
                 // the nothing hit was not out of range, but still nothing was hit
-                WhatDidITouch feedback = new WhatDidITouch()
-                {
+                WhatDidITouch feedback = new WhatDidITouch() {
                     didHandTouchSomething = false,
                     objectId = "",
                     armsLength = action.handDistance
@@ -3277,21 +2837,18 @@ public void TouchThenApplyForce(ServerAction action)
         }
 
         // for use with TouchThenApplyForce feedback return
-        public struct WhatDidITouch
-        {
+        public struct WhatDidITouch {
             public bool didHandTouchSomething; // did the hand touch something or did it hit nothing?
             public string objectId; // id of object touched, if it is a sim object
             public float armsLength; // the amount the hand moved from it's starting position to hit the object touched
         }
 
         // checks if agent hand that is holding an object can move to a target location. Returns false if any obstructions
-        public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible = false)
-        {
+        public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible = false) {
             bool result = false;
 
             // first check if we have anything in our hand, if not then no reason to move hand
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 errorMessage = "Agent can only move hand if currently holding an item";
                 result = false;
                 return result;
@@ -3301,8 +2858,7 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
             Vector3 tmp = m_Camera.transform.position;
             tmp.y = targetPosition.y;
 
-            if (Vector3.Distance(tmp, targetPosition) > maxVisibleDistance)
-            {
+            if (Vector3.Distance(tmp, targetPosition) > maxVisibleDistance) {
                 errorMessage =
                     "The target position is out of range- object cannot move outside of max visibility distance.";
                 result = false;
@@ -3315,8 +2871,7 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
             Vector3 lastPosition = AgentHand.transform.position;
             AgentHand.transform.position = targetPosition;
             // now make sure that the targetPosition is within the Agent's x/y view, restricted by camera
-            if (!objectIsWithinViewport(ItemInHand.GetComponent<SimObjPhysics>()))
-            {
+            if (!objectIsWithinViewport(ItemInHand.GetComponent<SimObjPhysics>())) {
                 AgentHand.transform.position = lastPosition;
                 errorMessage =
                     "Target position is outside of the agent's viewport. The target position must be within the frustrum of the viewport.";
@@ -3329,13 +2884,11 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
 
             // by default this is ignored, but pass this as true to force hand manipulation
             // such that objects will always remain visible to the agent and not occluded
-            if (mustBeVisible)
-            {
+            if (mustBeVisible) {
                 // quickly move object to proposed target position and see if target is still visible
                 lastPosition = AgentHand.transform.position;
                 AgentHand.transform.position = targetPosition;
-                if (!objectIsCurrentlyVisible(ItemInHand.GetComponent<SimObjPhysics>(), 1000f))
-                {
+                if (!objectIsCurrentlyVisible(ItemInHand.GetComponent<SimObjPhysics>(), 1000f)) {
                     errorMessage =
                         "The target position is not in the Area of the Agent's Viewport!";
                     result = false;
@@ -3356,19 +2909,15 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
             );
 
             // did we hit anything?
-            if (sweepResults.Length > 0)
-            {
-                foreach (RaycastHit hit in sweepResults)
-                {
+            if (sweepResults.Length > 0) {
+                foreach (RaycastHit hit in sweepResults) {
                     // hit the player? it's cool, no problem
-                    if (hit.transform.tag == "Player")
-                    {
+                    if (hit.transform.tag == "Player") {
                         result = true;
                         break;
                     }
                     // oh we hit something else? oh boy, that's blocking!
-                    else
-                    {
+                    else {
                         errorMessage =
                             hit.transform.name
                             + " is in Object In Hand's Path! Can't Move Hand holding "
@@ -3379,8 +2928,7 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
                 }
             }
             // didnt hit anything in sweep, we are good to go
-            else
-            {
+            else {
                 result = true;
             }
 
@@ -3388,29 +2936,23 @@ public bool CheckIfAgentCanMoveHand(Vector3 targetPosition, bool mustBeVisible =
         }
 
         // moves hand to the x, y, z coordinate, not constrained by any axis, if within range
-        protected bool moveHandToXYZ(float x, float y, float z, bool mustBeVisible = false)
-        {
+        protected bool moveHandToXYZ(float x, float y, float z, bool mustBeVisible = false) {
             Vector3 targetPosition = new Vector3(x, y, z);
-            if (CheckIfAgentCanMoveHand(targetPosition, mustBeVisible))
-            {
+            if (CheckIfAgentCanMoveHand(targetPosition, mustBeVisible)) {
                 // Debug.Log("Movement of Agent Hand holding " + ItemInHand.name + " succesful!");
                 Vector3 oldPosition = AgentHand.transform.position;
                 AgentHand.transform.position = targetPosition;
                 IsHandDefault = false;
                 return true;
-            }
-            else
-            {
+            } else {
                 // error messages are set up in CheckIfAgentCanMoveHand
                 return false;
             }
         }
 
         // coroutine to yield n frames before returning
-        protected IEnumerator waitForNFramesAndReturn(int n, bool actionSuccess)
-        {
-            for (int i = 0; i < n; i++)
-            {
+        protected IEnumerator waitForNFramesAndReturn(int n, bool actionSuccess) {
+            for (int i = 0; i < n; i++) {
                 yield return null;
             }
             actionFinished(actionSuccess);
@@ -3419,8 +2961,7 @@ protected IEnumerator waitForNFramesAndReturn(int n, bool actionSuccess)
         // Moves hand relative the agent (but not relative the camera, i.e. up is up)
         // x, y, z coordinates should specify how far to move in that direction, so
         // x=.1, y=.1, z=0 will move the hand .1 in both the x and y coordinates.
-        public void MoveHand(float x, float y, float z)
-        {
+        public void MoveHand(float x, float y, float z) {
             // get new direction relative to Agent forward facing direction (not the camera)
             Vector3 newPos =
                 AgentHand.transform.position
@@ -3434,8 +2975,7 @@ public void MoveHand(float x, float y, float z)
             message: "This action is deprecated. Call MoveHeldObject(right, up, ahead) instead.",
             error: false
         )]
-        public void MoveHandDelta(float x, float y, float z, bool forceVisible = false)
-        {
+        public void MoveHandDelta(float x, float y, float z, bool forceVisible = false) {
             MoveHeldObject(right: x, up: y, ahead: z);
         }
 
@@ -3445,8 +2985,7 @@ public void MoveHeldObject(
             float up = 0,
             float ahead = 0,
             bool forceVisible = false
-        )
-        {
+        ) {
             Vector3 newPos = AgentHand.transform.position;
             newPos += (
                 m_Camera.transform.forward * ahead
@@ -3460,13 +2999,11 @@ public void MoveHeldObject(
             message: "This action is deprecated. Call MoveHeldObjectAhead() instead.",
             error: false
         )]
-        public void MoveHandAhead(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandAhead(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectAhead(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectAhead(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectAhead(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (m_Camera.transform.forward * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3476,13 +3013,11 @@ public void MoveHeldObjectAhead(float moveMagnitude, bool forceVisible = false)
             message: "This action is deprecated. Call MoveHeldObjectLeft() instead.",
             error: false
         )]
-        public void MoveHandLeft(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandLeft(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectLeft(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectLeft(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectLeft(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (-m_Camera.transform.right * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3492,13 +3027,11 @@ public void MoveHeldObjectLeft(float moveMagnitude, bool forceVisible = false)
             message: "This action is deprecated. Call MoveHeldObjectDown() instead.",
             error: false
         )]
-        public void MoveHandDown(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandDown(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectDown(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectDown(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectDown(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (-m_Camera.transform.up * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3508,13 +3041,11 @@ public void MoveHeldObjectDown(float moveMagnitude, bool forceVisible = false)
             message: "This action is deprecated. Call MoveHeldObjectUp() instead.",
             error: false
         )]
-        public void MoveHandUp(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandUp(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectUp(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectUp(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectUp(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (m_Camera.transform.up * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3524,13 +3055,11 @@ public void MoveHeldObjectUp(float moveMagnitude, bool forceVisible = false)
             message: "This action is deprecated. Call MoveHeldObjectRight() instead.",
             error: false
         )]
-        public void MoveHandRight(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandRight(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectRight(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectRight(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectRight(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (m_Camera.transform.right * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3540,13 +3069,11 @@ public void MoveHeldObjectRight(float moveMagnitude, bool forceVisible = false)
             message: "This action is deprecated. Call MoveHeldObjectBack() instead.",
             error: false
         )]
-        public void MoveHandBack(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHandBack(float moveMagnitude, bool forceVisible = false) {
             MoveHeldObjectBack(moveMagnitude: moveMagnitude, forceVisible: forceVisible);
         }
 
-        public void MoveHeldObjectBack(float moveMagnitude, bool forceVisible = false)
-        {
+        public void MoveHeldObjectBack(float moveMagnitude, bool forceVisible = false) {
             Vector3 newPos = AgentHand.transform.position;
             newPos = newPos + (-m_Camera.transform.forward * moveMagnitude);
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z, forceVisible));
@@ -3559,63 +3086,51 @@ public void MoveHandMagnitude(
             float x = 0.0f,
             float y = 0.0f,
             float z = 0.0f
-        )
-        {
+        ) {
             Vector3 newPos = AgentHand.transform.position;
 
             // get new direction relative to Agent's (camera's) forward facing
-            if (x > 0)
-            {
+            if (x > 0) {
                 newPos = newPos + (m_Camera.transform.right * moveMagnitude);
             }
 
-            if (x < 0)
-            {
+            if (x < 0) {
                 newPos = newPos + (-m_Camera.transform.right * moveMagnitude);
             }
 
-            if (y > 0)
-            {
+            if (y > 0) {
                 newPos = newPos + (m_Camera.transform.up * moveMagnitude);
             }
 
-            if (y < 0)
-            {
+            if (y < 0) {
                 newPos = newPos + (-m_Camera.transform.up * moveMagnitude);
             }
 
-            if (z > 0)
-            {
+            if (z > 0) {
                 newPos = newPos + (m_Camera.transform.forward * moveMagnitude);
             }
 
-            if (z < 0)
-            {
+            if (z < 0) {
                 newPos = newPos + (-m_Camera.transform.forward * moveMagnitude);
             }
 
             actionFinished(moveHandToXYZ(newPos.x, newPos.y, newPos.z));
         }
 
-        public bool IsInArray(Collider collider, GameObject[] arrayOfCol)
-        {
-            for (int i = 0; i < arrayOfCol.Length; i++)
-            {
-                if (collider == arrayOfCol[i].GetComponent<Collider>())
-                {
+        public bool IsInArray(Collider collider, GameObject[] arrayOfCol) {
+            for (int i = 0; i < arrayOfCol.Length; i++) {
+                if (collider == arrayOfCol[i].GetComponent<Collider>()) {
                     return true;
                 }
             }
             return false;
         }
 
-        public bool CheckIfAgentCanRotateHand()
-        {
+        public bool CheckIfAgentCanRotateHand() {
             bool result = false;
 
             // make sure there is a box collider
-            if (ItemInHand.GetComponent<SimObjPhysics>().BoundingBox.GetComponent<BoxCollider>())
-            {
+            if (ItemInHand.GetComponent<SimObjPhysics>().BoundingBox.GetComponent<BoxCollider>()) {
                 Vector3 sizeOfBox = ItemInHand
                     .GetComponent<SimObjPhysics>()
                     .BoundingBox.GetComponent<BoxCollider>()
@@ -3637,33 +3152,27 @@ public bool CheckIfAgentCanRotateHand()
                 );
 
                 // did we even hit anything?
-                if (hitColliders.Length > 0)
-                {
-                    foreach (Collider col in hitColliders)
-                    {
+                if (hitColliders.Length > 0) {
+                    foreach (Collider col in hitColliders) {
                         // is this a sim object?
-                        if (col.GetComponentInParent<SimObjPhysics>())
-                        {
+                        if (col.GetComponentInParent<SimObjPhysics>()) {
                             // is it not the item we are holding? then it's blocking
                             if (
                                 col.GetComponentInParent<SimObjPhysics>().transform
                                 != ItemInHand.transform
-                            )
-                            {
+                            ) {
                                 errorMessage =
                                     "Rotating the object results in it colliding with "
                                     + col.gameObject.name;
                                 return false;
                             }
                             // oh it is the item we are holding, it's fine
-                            else
-                            {
+                            else {
                                 result = true;
                             }
                         }
                         // ok it's not a sim obj and it's not the player, so it must be a structure or something else that would block
-                        else if (col.tag != "Player")
-                        {
+                        else if (col.tag != "Player") {
                             errorMessage =
                                 "Rotating the object results in it colliding with an agent.";
                             return false;
@@ -3671,13 +3180,10 @@ public bool CheckIfAgentCanRotateHand()
                     }
                 }
                 // nothing hit by sphere, so we are safe to rotate
-                else
-                {
+                else {
                     result = true;
                 }
-            }
-            else
-            {
+            } else {
                 Debug.Log("item in hand is missing a collider box for some reason! Oh nooo!");
             }
 
@@ -3688,23 +3194,19 @@ public bool CheckIfAgentCanRotateHand()
             message: "This action is deprecated. Call RotateHeldObject() instead.",
             error: false
         )]
-        public void RotateHand(float x, float y, float z)
-        {
+        public void RotateHand(float x, float y, float z) {
             RotateHeldObject(rotation: new Vector3(x, y, z));
         }
 
         // rotate the held object if there is an object in it
-        public void RotateHeldObject(Vector3 rotation)
-        {
-            if (ItemInHand == null)
-            {
+        public void RotateHeldObject(Vector3 rotation) {
+            if (ItemInHand == null) {
                 throw new InvalidOperationException(
                     "Can't rotate held object since no object is being held."
                 );
             }
 
-            if (!CheckIfAgentCanRotateHand())
-            {
+            if (!CheckIfAgentCanRotateHand()) {
                 throw new InvalidOperationException(
                     "Object is unable to rotate in its current state!"
                 );
@@ -3714,8 +3216,7 @@ public void RotateHeldObject(Vector3 rotation)
             // SetUpRotationBoxChecks();
 
             // if this is rotated too much, drop any contained object if held item is a receptacle
-            if (Vector3.Angle(ItemInHand.transform.up, Vector3.up) > 95)
-            {
+            if (Vector3.Angle(ItemInHand.transform.up, Vector3.up) > 95) {
                 ItemInHand
                     .GetComponent<SimObjPhysics>()
                     .DropContainedObjects(reparentContainedObjects: true, forceKinematic: false);
@@ -3725,10 +3226,8 @@ public void RotateHeldObject(Vector3 rotation)
         }
 
         // rotate the hand if there is an object in it
-        public void RotateHeldObject(float pitch = 0, float yaw = 0, float roll = 0)
-        {
-            if (ItemInHand == null)
-            {
+        public void RotateHeldObject(float pitch = 0, float yaw = 0, float roll = 0) {
+            if (ItemInHand == null) {
                 throw new InvalidOperationException(
                     "Can't rotate held object since no object is being held."
                 );
@@ -3743,8 +3242,7 @@ public void RotateHeldObject(float pitch = 0, float yaw = 0, float roll = 0)
             AgentHand.transform.Rotate(new Vector3(pitch, yaw, -roll), Space.World);
             transform.rotation = agentRot;
 
-            if (isHandObjectColliding(true))
-            {
+            if (isHandObjectColliding(true)) {
                 AgentHand.transform.rotation = agentHandStartRot;
                 throw new InvalidOperationException("Held object is coliding after rotation.");
             }
@@ -3753,8 +3251,7 @@ public void RotateHeldObject(float pitch = 0, float yaw = 0, float roll = 0)
         }
 
         // rotate the hand if there is an object in it
-        public void RotateHandRelative(float x = 0, float y = 0, float z = 0)
-        {
+        public void RotateHandRelative(float x = 0, float y = 0, float z = 0) {
             // NOTE: -z is used for backwards compatibility.
             RotateHeldObject(pitch: x, yaw: y, roll: -z);
         }
@@ -3766,8 +3263,7 @@ public void SpawnObjectInReceptacleRandomly(
             string prefabName,
             string targetReceptacle,
             FlexibleRotation rotation
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromId(targetReceptacle, true);
             var spawnedObj = ProceduralTools.spawnObjectInReceptacleRandomly(
                 this,
@@ -3779,8 +3275,7 @@ FlexibleRotation rotation
             );
             bool result = false;
             //object succesfully spawned, wait for it to settle, then actionReturn success and the object's position
-            if (spawnedObj != null)
-            {
+            if (spawnedObj != null) {
                 result = true;
                 StartCoroutine(
                     checkIfObjectHasStoppedMoving(
@@ -3788,9 +3283,7 @@ FlexibleRotation rotation
                         useTimeout: false
                     )
                 );
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     $"object ({prefabName}) could not find free space to spawn in ({targetReceptacle})";
                 //if spawnedObj null, that means the random spawn failed because it couldn't find a free position
@@ -3805,8 +3298,7 @@ public void SpawnObjectInReceptacle(
             string targetReceptacle,
             Vector3 position,
             FlexibleRotation rotation
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromId(targetReceptacle, true);
             var spawnedObj = ProceduralTools.spawnObjectInReceptacle(
                 this,
@@ -3819,8 +3311,7 @@ FlexibleRotation rotation
             );
             bool result = false;
             //object succesfully spawned, wait for it to settle, then actionReturn success and the object's position
-            if (spawnedObj != null)
-            {
+            if (spawnedObj != null) {
                 result = true;
                 StartCoroutine(
                     checkIfObjectHasStoppedMoving(
@@ -3828,9 +3319,7 @@ FlexibleRotation rotation
                         useTimeout: false
                     )
                 );
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     $"object ({prefabName}) could not find free space to spawn in ({targetReceptacle}) at position ({position})";
                 //if spawnedObj null, that means the random spawn failed because it couldn't find a free position
@@ -3839,8 +3328,7 @@ FlexibleRotation rotation
         }
 
         //generic spawn object in scene, no physics resoultion or bounds/collision check
-        public void SpawnObjectInScene(HouseObject ho)
-        {
+        public void SpawnObjectInScene(HouseObject ho) {
             CollisionDetectionMode collDet = CollisionDetectionMode.ContinuousSpeculative;
             Enum.TryParse(ho.collisionDetectionMode, true, out collDet);
             var spawnedObj = ProceduralTools.spawnHouseObject(
@@ -3853,13 +3341,11 @@ public void SpawnObjectInScene(HouseObject ho)
 
         //used to spawn in a new object at a given position, used with ProceduralTools.spawnObjectAtReceptacle
         //places an object on the surface directly below the `position` value, with slight offset
-        public bool placeNewObjectAtPoint(SimObjPhysics t, Vector3 position)
-        {
+        public bool placeNewObjectAtPoint(SimObjPhysics t, Vector3 position) {
             SimObjPhysics target = t;
 
             // make sure point we are moving the object to is valid
-            if (!agentManager.SceneBounds.Contains(position))
-            {
+            if (!agentManager.SceneBounds.Contains(position)) {
                 return false;
             }
 
@@ -3883,8 +3369,7 @@ public bool placeNewObjectAtPoint(SimObjPhysics t, Vector3 position)
 
             //check spawn area, if its clear, then place object at finalPos
             InstantiatePrefabTest ipt = physicsSceneManager.GetComponent<InstantiatePrefabTest>();
-            if (ipt.CheckSpawnArea(target, finalPos, target.transform.rotation, false))
-            {
+            if (ipt.CheckSpawnArea(target, finalPos, target.transform.rotation, false)) {
                 target.transform.position = finalPos;
                 return true;
             }
@@ -3897,8 +3382,7 @@ public void ScaleObject(
             float scale,
             float scaleOverSeconds = 1.0f,
             bool forceAction = false
-        )
-        {
+        ) {
             // if object is in the scene and visible, assign it to 'target'
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
@@ -3906,14 +3390,11 @@ public void ScaleObject(
             );
 
             // neither objectId nor coordinates found an object
-            if (target == null)
-            {
+            if (target == null) {
                 errorMessage = $"Object with ID {objectId} does not appear to be interactable.";
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 StartCoroutine(
                     scaleObject(gameObject.transform.localScale * scale, target, scaleOverSeconds)
                 );
@@ -3926,8 +3407,7 @@ public void ScaleObject(
             float scale,
             float scaleOverSeconds = 1.0f,
             bool forceAction = false
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromXY(
                 x: x,
                 y: y,
@@ -3943,8 +3423,7 @@ private IEnumerator scaleObject(
             SimObjPhysics target,
             float scaleOverSeconds,
             bool skipActionFinished = false
-        )
-        {
+        ) {
             return scaleObject(
                 targetScale: this.transform.localScale * scale,
                 target: target,
@@ -3958,20 +3437,15 @@ private IEnumerator scaleObject(
             SimObjPhysics target,
             float scaleOverSeconds,
             bool skipActionFinished = false
-        )
-        {
+        ) {
             Vector3 originalScale = target.transform.localScale;
             float currentTime = 0.0f;
 
-            if (scaleOverSeconds <= 0f)
-            {
+            if (scaleOverSeconds <= 0f) {
                 target.transform.localScale = targetScale;
-            }
-            else
-            {
+            } else {
                 yield return new WaitForFixedUpdate();
-                do
-                {
+                do {
                     target.transform.localScale = Vector3.Lerp(
                         originalScale,
                         targetScale,
@@ -3985,8 +3459,7 @@ private IEnumerator scaleObject(
             // store reference to all children
             Transform[] children = new Transform[target.transform.childCount];
 
-            for (int i = 0; i < target.transform.childCount; i++)
-            {
+            for (int i = 0; i < target.transform.childCount; i++) {
                 children[i] = target.transform.GetChild(i);
             }
 
@@ -3995,8 +3468,7 @@ private IEnumerator scaleObject(
             // zero out object transform to be 1, 1, 1
             target.transform.transform.localScale = Vector3.one;
             // reparent all children
-            foreach (Transform t in children)
-            {
+            foreach (Transform t in children) {
                 t.SetParent(target.transform);
             }
 
@@ -4004,8 +3476,7 @@ private IEnumerator scaleObject(
 
             target.ContextSetUpBoundingBox(forceCacheReset: true);
 
-            if (!skipActionFinished)
-            {
+            if (!skipActionFinished) {
                 actionFinished(true);
             }
         }
@@ -4016,10 +3487,8 @@ private IEnumerator scaleObject(
         // return a bunch of vector3 points above a target receptacle
         // if forceVisible = true, return points regardless of where receptacle is
         // if forceVisible = false, only return points that are also within view of the Agent camera
-        public void GetSpawnCoordinatesAboveReceptacle(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void GetSpawnCoordinatesAboveReceptacle(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Object ID appears to be invalid.";
                 actionFinished(false);
                 return;
@@ -4029,22 +3498,16 @@ public void GetSpawnCoordinatesAboveReceptacle(ServerAction action)
             // find our target receptacle
             // if action.anywhere False (default) this should only return objects that are visible
             // if action.anywhere true, return for any object no matter where it is
-            foreach (SimObjPhysics sop in VisibleSimObjs(action.anywhere))
-            {
-                if (action.objectId == sop.ObjectID)
-                {
+            foreach (SimObjPhysics sop in VisibleSimObjs(action.anywhere)) {
+                if (action.objectId == sop.ObjectID) {
                     target = sop;
                 }
             }
 
-            if (target == null)
-            {
-                if (action.anywhere)
-                {
+            if (target == null) {
+                if (action.anywhere) {
                     errorMessage = "No valid Receptacle found in scene";
-                }
-                else
-                {
+                } else {
                     errorMessage = "No valid Receptacle found in view";
                 }
 
@@ -4058,22 +3521,17 @@ public void GetSpawnCoordinatesAboveReceptacle(ServerAction action)
 
             // by default, action.anywhere = false, so remove all targetPoints that are outside of agent's view
             // if anywhere true, don't do this and just return all points we got from above
-            if (!action.anywhere)
-            {
+            if (!action.anywhere) {
                 List<Vector3> filteredTargetPoints = new List<Vector3>();
-                foreach (Vector3 v in targetPoints)
-                {
-                    try
-                    {
+                foreach (Vector3 v in targetPoints) {
+                    try {
                         assertPosInView(
                             targetPosition: v,
                             inMaxVisibleDistance: true,
                             inViewport: true
                         );
                         filteredTargetPoints.Add(v);
-                    }
-                    catch (Exception e)
-                    {
+                    } catch (Exception e) {
                         continue;
                     }
                 }
@@ -4094,8 +3552,7 @@ public void GetSpawnCoordinatesAboveReceptacle(ServerAction action)
         public List<Vector3> getSpawnCoordinatesAboveReceptacle(
             SimObjPhysics t,
             bool fromReceptacleTop = true
-        )
-        {
+        ) {
             SimObjPhysics target = t;
             // ok now get spawn points from target
             List<Vector3> targetPoints = new List<Vector3>();
@@ -4108,18 +3565,15 @@ public void MakeReceptacleDirty(
             float density,
             int seed = 0,
             Vector3? scale = null
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 actionFinished(
                     success: false,
                     errorMessage: $"Object ID {objectId} appears to be invalid."
                 );
             }
             SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
-            if (!sop.IsReceptacle)
-            {
+            if (!sop.IsReceptacle) {
                 actionFinished(
                     success: false,
                     errorMessage: $"Object ID {objectId} is not a Receptacle."
@@ -4143,8 +3597,7 @@ public void MakeReceptacleDirty(
             var selectedCoords = spawnCoordinates
                 .Shuffle_(new System.Random(seed))
                 .Take(coordinateCount);
-            foreach (var coord in selectedCoords)
-            {
+            foreach (var coord in selectedCoords) {
                 dc.SpawnDecal(
                     position: coord,
                     scale: scale,
@@ -4156,10 +3609,8 @@ public void MakeReceptacleDirty(
 
         // instantiate a target circle, and then place it in a "SpawnOnlyOUtsideReceptacle" that is also within camera view
         // If fails, return actionFinished(false) and despawn target circle
-        public void SpawnTargetCircle(ServerAction action)
-        {
-            if (action.objectVariation > 2 || action.objectVariation < 0)
-            {
+        public void SpawnTargetCircle(ServerAction action) {
+            if (action.objectVariation > 2 || action.objectVariation < 0) {
                 errorMessage =
                     "Please use valid int for SpawnTargetCircleAction. Valid ints are: 0, 1, 2 for small, medium, large circles";
                 actionFinished(false);
@@ -4177,25 +3628,20 @@ public void SpawnTargetCircle(ServerAction action)
             InstantiatePrefabTest ipt = physicsSceneManager.GetComponent<InstantiatePrefabTest>();
 
             // this is the default, only spawn circles in objects that are in view
-            if (!action.anywhere)
-            {
+            if (!action.anywhere) {
                 // check every sim object and see if it is within the viewport
-                foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                {
+                foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
                     if (
                         sop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.Receptacle
                         )
-                    )
-                    {
+                    ) {
                         /// one more check, make sure this receptacle
                         if (
                             ReceptacleRestrictions.SpawnOnlyOutsideReceptacles.Contains(sop.ObjType)
-                        )
-                        {
+                        ) {
                             // ok now check if the object is for real in the viewport
-                            if (objectIsWithinViewport(sop))
-                            {
+                            if (objectIsWithinViewport(sop)) {
                                 targetReceptacles.Add(sop);
                             }
                         }
@@ -4203,26 +3649,20 @@ public void SpawnTargetCircle(ServerAction action)
                 }
             }
             // spawn target circle in any valid "outside" receptacle in the scene even if not in veiw
-            else
-            {
+            else {
                 // targetReceptacles.AddRange(physicsSceneManager.ReceptaclesInScene);
-                foreach (SimObjPhysics sop in physicsSceneManager.GatherAllReceptaclesInScene())
-                {
-                    if (ReceptacleRestrictions.SpawnOnlyOutsideReceptacles.Contains(sop.ObjType))
-                    {
+                foreach (SimObjPhysics sop in physicsSceneManager.GatherAllReceptaclesInScene()) {
+                    if (ReceptacleRestrictions.SpawnOnlyOutsideReceptacles.Contains(sop.ObjType)) {
                         targetReceptacles.Add(sop);
                     }
                 }
             }
 
             // if we passed in a objectId, see if it is in the list of targetReceptacles found so far
-            if (action.objectId != null)
-            {
+            if (action.objectId != null) {
                 List<SimObjPhysics> filteredTargetReceptacleList = new List<SimObjPhysics>();
-                foreach (SimObjPhysics sop in targetReceptacles)
-                {
-                    if (sop.objectID == action.objectId)
-                    {
+                foreach (SimObjPhysics sop in targetReceptacles) {
+                    if (sop.objectID == action.objectId) {
                         filteredTargetReceptacleList.Add(sop);
                     }
                 }
@@ -4237,8 +3677,7 @@ public void SpawnTargetCircle(ServerAction action)
 
             bool succesfulSpawn = false;
 
-            if (targetReceptacles.Count <= 0)
-            {
+            if (targetReceptacles.Count <= 0) {
                 errorMessage = "for some reason, no receptacles were found in the scene!";
                 Destroy(targetCircle);
                 actionFinished(false);
@@ -4246,8 +3685,7 @@ public void SpawnTargetCircle(ServerAction action)
             }
 
             // ok we have a shuffled list of receptacles that is picked based on the seed....
-            foreach (SimObjPhysics sop in targetReceptacles)
-            {
+            foreach (SimObjPhysics sop in targetReceptacles) {
                 // for every receptacle, we will get a returned list of receptacle spawn points, and then try placeObjectReceptacle
                 List<ReceptacleSpawnPoint> rsps = new List<ReceptacleSpawnPoint>();
 
@@ -4256,10 +3694,8 @@ public void SpawnTargetCircle(ServerAction action)
                 bool constraintsUsed = false; // only set rsps to editedRsps if constraints were passed in
 
                 // only do further constraint checks if defaults are overwritten
-                if (!(action.minDistance == 0 && action.maxDistance == 0))
-                {
-                    foreach (ReceptacleSpawnPoint p in rsps)
-                    {
+                if (!(action.minDistance == 0 && action.maxDistance == 0)) {
+                    foreach (ReceptacleSpawnPoint p in rsps) {
                         // get rid of differences in y values for points
                         Vector3 normalizedPosition = new Vector3(
                             transform.position.x,
@@ -4268,16 +3704,14 @@ public void SpawnTargetCircle(ServerAction action)
                         );
                         Vector3 normalizedPoint = new Vector3(p.Point.x, 0, p.Point.z);
 
-                        if (action.minDistance == 0 && action.maxDistance > 0)
-                        {
+                        if (action.minDistance == 0 && action.maxDistance > 0) {
                             // check distance from agent's transform to spawnpoint
                             if (
                                 (
                                     Vector3.Distance(normalizedPoint, normalizedPosition)
                                     <= action.maxDistance
                                 )
-                            )
-                            {
+                            ) {
                                 editedRsps.Add(p);
                             }
 
@@ -4285,23 +3719,19 @@ public void SpawnTargetCircle(ServerAction action)
                         }
 
                         // min distance passed in, no max distance
-                        if (action.maxDistance == 0 && action.minDistance > 0)
-                        {
+                        if (action.maxDistance == 0 && action.minDistance > 0) {
                             // check distance from agent's transform to spawnpoint
                             if (
                                 (
                                     Vector3.Distance(normalizedPoint, normalizedPosition)
                                     >= action.minDistance
                                 )
-                            )
-                            {
+                            ) {
                                 editedRsps.Add(p);
                             }
 
                             constraintsUsed = true;
-                        }
-                        else
-                        {
+                        } else {
                             // these are default so don't filter by distance
                             // check distance from agent's transform to spawnpoint
                             if (
@@ -4311,8 +3741,7 @@ public void SpawnTargetCircle(ServerAction action)
                                     && Vector3.Distance(normalizedPoint, normalizedPosition)
                                         <= action.maxDistance
                                 )
-                            )
-                            {
+                            ) {
                                 editedRsps.Add(p);
                             }
 
@@ -4321,16 +3750,14 @@ public void SpawnTargetCircle(ServerAction action)
                     }
                 }
 
-                if (constraintsUsed)
-                {
+                if (constraintsUsed) {
                     rsps = editedRsps;
                 }
 
                 rsps.Shuffle_(action.randomSeed);
 
                 // only place in viewport
-                if (!action.anywhere)
-                {
+                if (!action.anywhere) {
                     if (
                         ipt.PlaceObjectReceptacleInViewport(
                             this,
@@ -4341,16 +3768,14 @@ public void SpawnTargetCircle(ServerAction action)
                             90,
                             true
                         )
-                    )
-                    {
+                    ) {
                         // make sure target circle is within viewport
                         succesfulSpawn = true;
                         break;
                     }
                 }
                 // place anywhere
-                else
-                {
+                else {
                     if (
                         ipt.PlaceObjectReceptacle(
                             rsps,
@@ -4360,8 +3785,7 @@ public void SpawnTargetCircle(ServerAction action)
                             90,
                             true
                         )
-                    )
-                    {
+                    ) {
                         // make sure target circle is within viewport
                         succesfulSpawn = true;
                         break;
@@ -4369,17 +3793,14 @@ public void SpawnTargetCircle(ServerAction action)
                 }
             }
 
-            if (succesfulSpawn)
-            {
+            if (succesfulSpawn) {
                 // if image synthesis is active, make sure to update the renderers for image synthesis since now there are new objects with renderes in the scene
                 BaseFPSAgentController primaryAgent = GameObject
                     .Find("PhysicsSceneManager")
                     .GetComponent<AgentManager>()
                     .PrimaryAgent;
-                if (primaryAgent.imageSynthesis)
-                {
-                    if (primaryAgent.imageSynthesis.enabled)
-                    {
+                if (primaryAgent.imageSynthesis) {
+                    if (primaryAgent.imageSynthesis.enabled) {
                         primaryAgent.imageSynthesis.OnSceneChange();
                     }
                 }
@@ -4388,37 +3809,29 @@ public void SpawnTargetCircle(ServerAction action)
                 physicsSceneManager.Generate_ObjectID(targetSOP);
                 physicsSceneManager.AddToObjectsInScene(targetSOP);
                 actionFinished(true, targetSOP.objectID); // return the objectID of circle spawned for easy reference
-            }
-            else
-            {
+            } else {
                 Destroy(targetCircle);
                 errorMessage = "circle failed to spawn";
                 actionFinished(false);
             }
         }
 
-        public void MakeObjectsOfTypeUnbreakable(string objectType)
-        {
-            if (objectType == null)
-            {
+        public void MakeObjectsOfTypeUnbreakable(string objectType) {
+            if (objectType == null) {
                 errorMessage = "no object type specified for MakeOBjectsOfTypeUnbreakable()";
                 actionFinished(false);
             }
 
             SimObjPhysics[] simObjs =
                 GameObject.FindObjectsOfType(typeof(SimObjPhysics)) as SimObjPhysics[];
-            if (simObjs != null)
-            {
-                foreach (SimObjPhysics sop in simObjs)
-                {
-                    if (sop.Type.ToString() == objectType)
-                    {
+            if (simObjs != null) {
+                foreach (SimObjPhysics sop in simObjs) {
+                    if (sop.Type.ToString() == objectType) {
                         if (
                             sop.DoesThisObjectHaveThisSecondaryProperty(
                                 SimObjSecondaryProperty.CanBreak
                             )
-                        )
-                        {
+                        ) {
                             //look both in this object and children so things like Windows don't FREAK OUT
                             sop.GetComponentInChildren<Break>().Unbreakable = true;
                         }
@@ -4429,15 +3842,12 @@ public void MakeObjectsOfTypeUnbreakable(string objectType)
             actionFinished(true);
         }
 
-        public void MakeObjectBreakable(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void MakeObjectBreakable(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 throw new ArgumentException($"Object ID {objectId} appears to be invalid.");
             }
             SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
-            if (sop.GetComponent<Break>())
-            {
+            if (sop.GetComponent<Break>()) {
                 sop.GetComponent<Break>().Unbreakable = false;
             }
             actionFinishedEmit(true);
@@ -4445,10 +3855,8 @@ public void MakeObjectBreakable(string objectId)
 
         // set all objects objects of a given type to a specific state, if that object has that state
         // ie: All objects of type Bowl that have the state property breakable, set isBroken = true
-        public void SetObjectStates(ServerAction action)
-        {
-            if (action.SetObjectStates == null)
-            {
+        public void SetObjectStates(ServerAction action) {
+            if (action.SetObjectStates == null) {
                 errorMessage = "action.SetObjectStates is null or not initialized!";
                 actionFinished(false);
                 return;
@@ -4458,8 +3866,7 @@ public void SetObjectStates(ServerAction action)
             if (
                 action.SetObjectStates.objectType == null
                 && action.SetObjectStates.stateChange == null
-            )
-            {
+            ) {
                 errorMessage =
                     "action.SetObjectStates has objectType and stateChange strings null. Please pass in valid strings.";
                 actionFinished(false);
@@ -4470,8 +3877,7 @@ public void SetObjectStates(ServerAction action)
             if (
                 action.SetObjectStates.objectType != null
                 && action.SetObjectStates.stateChange == null
-            )
-            {
+            ) {
                 errorMessage =
                     "action.SetObjectStates is missing stateChange string. If setting objects by objectType, Please specify both an objectType and a stateChange compatible with that objectType to set.";
                 actionFinished(false);
@@ -4482,49 +3888,40 @@ public void SetObjectStates(ServerAction action)
             if (
                 action.SetObjectStates.stateChange == "toggleable"
                 || action.SetObjectStates.stateChange == "openable"
-            )
-            {
+            ) {
                 StartCoroutine(SetStateOfAnimatedObjects(action.SetObjectStates));
             }
             // these object change states instantly, so no need for coroutine
             // the function called will handle the actionFinished() return;
-            else
-            {
+            else {
                 SetStateOfObjectsThatDontHaveAnimationTime(action.SetObjectStates);
             }
         }
 
         // find all objects in scene of type specified by SetObjectStates.objectType
         // toggle them to the bool if applicable: isOpen, isToggled, isBroken etc.
-        protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates)
-        {
+        protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates) {
             List<SimObjPhysics> animating = new List<SimObjPhysics>();
             Dictionary<SimObjPhysics, string> animatingType =
                 new Dictionary<SimObjPhysics, string>();
 
             // in this case, we will try and set isToggled for all toggleable objects in the entire scene
-            if (SetObjectStates.objectType == null)
-            {
-                foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                {
-                    if (SetObjectStates.stateChange == "toggleable")
-                    {
+            if (SetObjectStates.objectType == null) {
+                foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                    if (SetObjectStates.stateChange == "toggleable") {
                         if (
                             sop.DoesThisObjectHaveThisSecondaryProperty(
                                 SimObjSecondaryProperty.CanToggleOnOff
                             ) && sop.GetComponent<CanToggleOnOff>()
-                        )
-                        {
+                        ) {
                             StartCoroutine(toggleObject(sop, SetObjectStates.isToggled));
                             animating.Add(sop);
                             animatingType[sop] = "toggleable";
                         }
                     }
 
-                    if (SetObjectStates.stateChange == "openable")
-                    {
-                        if (sop.GetComponent<CanOpen_Object>())
-                        {
+                    if (SetObjectStates.stateChange == "openable") {
+                        if (sop.GetComponent<CanOpen_Object>()) {
                             openObject(
                                 target: sop,
                                 openness: SetObjectStates.isOpen ? 1 : 0,
@@ -4536,37 +3933,29 @@ protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates)
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 // in this case, we will only try and set states for objects of the specified objectType
                 SimObjType sot = (SimObjType)
                     System.Enum.Parse(typeof(SimObjType), SetObjectStates.objectType);
 
                 // for every sim obj in scene, find objects of type specified first
-                foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                {
+                foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
                     // ok we found an object with type specified, now toggle it
-                    if (sop.ObjType == sot)
-                    {
-                        if (SetObjectStates.stateChange == "toggleable")
-                        {
+                    if (sop.ObjType == sot) {
+                        if (SetObjectStates.stateChange == "toggleable") {
                             if (
                                 sop.DoesThisObjectHaveThisSecondaryProperty(
                                     SimObjSecondaryProperty.CanToggleOnOff
                                 ) && sop.GetComponent<CanToggleOnOff>()
-                            )
-                            {
+                            ) {
                                 StartCoroutine(toggleObject(sop, SetObjectStates.isToggled));
                                 animating.Add(sop);
                                 animatingType[sop] = "toggleable";
                             }
                         }
 
-                        if (SetObjectStates.stateChange == "openable")
-                        {
-                            if (sop.GetComponent<CanOpen_Object>())
-                            {
+                        if (SetObjectStates.stateChange == "openable") {
+                            if (sop.GetComponent<CanOpen_Object>()) {
                                 openObject(
                                     target: sop,
                                     openness: SetObjectStates.isOpen ? 1 : 0,
@@ -4581,14 +3970,11 @@ protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates)
                 }
             }
 
-            if (animating.Count > 0)
-            {
+            if (animating.Count > 0) {
                 // we have now started the toggle for all objects in the ObjectStates array
                 int numStillGoing = animating.Count;
-                while (numStillGoing > 0)
-                {
-                    foreach (SimObjPhysics sop in animating)
-                    {
+                while (numStillGoing > 0) {
+                    foreach (SimObjPhysics sop in animating) {
                         if (
                             animatingType.ContainsKey(sop)
                             && (
@@ -4598,14 +3984,12 @@ protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates)
                                 || animatingType[sop] == "openable"
                             )
                             && sop.GetComponent<CanOpen_Object>().GetIsCurrentlyLerping() == false
-                        )
-                        {
+                        ) {
                             numStillGoing--;
                         }
                     }
                     // someone is still animating
-                    if (numStillGoing > 0)
-                    {
+                    if (numStillGoing > 0) {
                         numStillGoing = animating.Count;
                     }
 
@@ -4619,345 +4003,273 @@ protected IEnumerator SetStateOfAnimatedObjects(SetObjectStates SetObjectStates)
         }
 
         // for setting object states that don't have an animation time, which means they don't require coroutines yeah!
-        protected void SetStateOfObjectsThatDontHaveAnimationTime(SetObjectStates SetObjectStates)
-        {
+        protected void SetStateOfObjectsThatDontHaveAnimationTime(SetObjectStates SetObjectStates) {
             // ok what state are we lookin at here
-            switch (SetObjectStates.stateChange)
-            {
-                case "breakable":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBreak
-                            )
-                        )
-                        {
-                            // only break objects that are not already broken
-                            Break b = sop.GetComponent<Break>();
-
-                            // only actually do stuff is the object is not broken and we are trying to break it
-                            if (!b.isBroken() && SetObjectStates.isBroken)
-                            {
-                                // oh we have a specific object type?
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+            switch (SetObjectStates.stateChange) {
+                case "breakable": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBreak
+                                )
+                            ) {
+                                // only break objects that are not already broken
+                                Break b = sop.GetComponent<Break>();
+
+                                // only actually do stuff is the object is not broken and we are trying to break it
+                                if (!b.isBroken() && SetObjectStates.isBroken) {
+                                    // oh we have a specific object type?
+                                    if (SetObjectStates.objectType != null) {
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            b.BreakObject(null);
+                                        } else {
+                                            continue;
+                                        }
+                                    } else {
                                         b.BreakObject(null);
                                     }
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    b.BreakObject(null);
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "canFillWithLiquid":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        // only proceed if the sop is fillable
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBeFilled
-                            )
-                        )
-                        {
-                            Fill fil = sop.GetComponent<Fill>();
-
-                            // object is empty and trying to fill it
-                            if (!fil.IsFilled() && SetObjectStates.isFilledWithLiquid)
-                            {
-                                // oh, we have a specific object type?
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    // we found an object of the type we want to set
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                case "canFillWithLiquid": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            // only proceed if the sop is fillable
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBeFilled
+                                )
+                            ) {
+                                Fill fil = sop.GetComponent<Fill>();
+
+                                // object is empty and trying to fill it
+                                if (!fil.IsFilled() && SetObjectStates.isFilledWithLiquid) {
+                                    // oh, we have a specific object type?
+                                    if (SetObjectStates.objectType != null) {
+                                        // we found an object of the type we want to set
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            fil.FillObject("water");
+                                        }
+                                        // doesn't match objectType, continue to next object
+                                        else {
+                                            continue;
+                                        }
+                                    } else {
                                         fil.FillObject("water");
                                     }
-                                    // doesn't match objectType, continue to next object
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    fil.FillObject("water");
                                 }
-                            }
-                            // object is full of some liquid, and trying to empty it
-                            else if (fil.IsFilled() && !SetObjectStates.isFilledWithLiquid)
-                            {
-                                // oh, we have a specific object type?
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    // we found an object of the type we want to set
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                                // object is full of some liquid, and trying to empty it
+                                else if (fil.IsFilled() && !SetObjectStates.isFilledWithLiquid) {
+                                    // oh, we have a specific object type?
+                                    if (SetObjectStates.objectType != null) {
+                                        // we found an object of the type we want to set
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            fil.EmptyObject();
+                                        }
+                                        // doesn't match objectType, continue to next object
+                                        else {
+                                            continue;
+                                        }
+                                    } else {
                                         fil.EmptyObject();
                                     }
-                                    // doesn't match objectType, continue to next object
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    fil.EmptyObject();
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
 
-                case "dirtyable":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        // only proceed if the sop is dirtyable
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBeDirty
-                            )
-                        )
-                        {
-                            Dirty deedsDoneDirtCheap = sop.GetComponent<Dirty>();
-
-                            // object is clean and we are trying to dirty it
-                            if (!deedsDoneDirtCheap.IsDirty() && SetObjectStates.isDirty)
-                            {
-                                // oh, we have a specific object type?
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    // we found an object of the type we want to set
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                case "dirtyable": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            // only proceed if the sop is dirtyable
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBeDirty
+                                )
+                            ) {
+                                Dirty deedsDoneDirtCheap = sop.GetComponent<Dirty>();
+
+                                // object is clean and we are trying to dirty it
+                                if (!deedsDoneDirtCheap.IsDirty() && SetObjectStates.isDirty) {
+                                    // oh, we have a specific object type?
+                                    if (SetObjectStates.objectType != null) {
+                                        // we found an object of the type we want to set
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            deedsDoneDirtCheap.ToggleCleanOrDirty();
+                                        }
+                                        // doesn't match objectType, continue to next object
+                                        else {
+                                            continue;
+                                        }
+                                    } else {
                                         deedsDoneDirtCheap.ToggleCleanOrDirty();
                                     }
-                                    // doesn't match objectType, continue to next object
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    deedsDoneDirtCheap.ToggleCleanOrDirty();
                                 }
-                            }
-                            // object is dirty and we are trying to clean it
-                            else if (deedsDoneDirtCheap.IsDirty() && !SetObjectStates.isDirty)
-                            {
-                                // oh, we have a specific object type?
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    // we found an object of the type we want to set
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                                // object is dirty and we are trying to clean it
+                                else if (deedsDoneDirtCheap.IsDirty() && !SetObjectStates.isDirty) {
+                                    // oh, we have a specific object type?
+                                    if (SetObjectStates.objectType != null) {
+                                        // we found an object of the type we want to set
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            deedsDoneDirtCheap.ToggleCleanOrDirty();
+                                        }
+                                        // doesn't match objectType, continue to next object
+                                        else {
+                                            continue;
+                                        }
+                                    } else {
                                         deedsDoneDirtCheap.ToggleCleanOrDirty();
                                     }
-                                    // doesn't match objectType, continue to next object
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    deedsDoneDirtCheap.ToggleCleanOrDirty();
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
 
                 // one way
-                case "cookable":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBeCooked
-                            )
-                        )
-                        {
-                            CookObject c = sop.GetComponent<CookObject>();
-
-                            // only do stuff if object is not cooked and we are trying to cook it
-                            if (!c.IsCooked() && SetObjectStates.isCooked)
-                            {
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                case "cookable": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBeCooked
+                                )
+                            ) {
+                                CookObject c = sop.GetComponent<CookObject>();
+
+                                // only do stuff if object is not cooked and we are trying to cook it
+                                if (!c.IsCooked() && SetObjectStates.isCooked) {
+                                    if (SetObjectStates.objectType != null) {
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            c.Cook();
+                                        } else {
+                                            continue;
+                                        }
+                                    } else {
                                         c.Cook();
                                     }
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    c.Cook();
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
 
                 // one way
-                case "sliceable":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBeSliced
-                            )
-                        )
-                        {
-                            SliceObject s = sop.GetComponent<SliceObject>();
-
-                            // only do stuff if object is unsliced and we are trying to slice it
-                            if (!s.IsSliced() && SetObjectStates.isSliced)
-                            {
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                case "sliceable": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBeSliced
+                                )
+                            ) {
+                                SliceObject s = sop.GetComponent<SliceObject>();
+
+                                // only do stuff if object is unsliced and we are trying to slice it
+                                if (!s.IsSliced() && SetObjectStates.isSliced) {
+                                    if (SetObjectStates.objectType != null) {
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            s.Slice();
+                                        } else {
+                                            continue;
+                                        }
+                                    } else {
                                         s.Slice();
                                     }
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    s.Slice();
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
 
                 // one way
-                case "canBeUsedUp":
-                {
-                    foreach (SimObjPhysics sop in VisibleSimObjs(true))
-                    {
-                        if (
-                            sop.DoesThisObjectHaveThisSecondaryProperty(
-                                SimObjSecondaryProperty.CanBeUsedUp
-                            )
-                        )
-                        {
-                            UsedUp u = sop.GetComponent<UsedUp>();
-
-                            // only do stuff if object is not used up and we are trying to use it up
-                            if (!u.isUsedUp && SetObjectStates.isUsedUp)
-                            {
-                                if (SetObjectStates.objectType != null)
-                                {
-                                    if (
-                                        sop.Type
-                                        == (SimObjType)
-                                            System.Enum.Parse(
-                                                typeof(SimObjType),
-                                                SetObjectStates.objectType
-                                            )
-                                    )
-                                    {
+                case "canBeUsedUp": {
+                        foreach (SimObjPhysics sop in VisibleSimObjs(true)) {
+                            if (
+                                sop.DoesThisObjectHaveThisSecondaryProperty(
+                                    SimObjSecondaryProperty.CanBeUsedUp
+                                )
+                            ) {
+                                UsedUp u = sop.GetComponent<UsedUp>();
+
+                                // only do stuff if object is not used up and we are trying to use it up
+                                if (!u.isUsedUp && SetObjectStates.isUsedUp) {
+                                    if (SetObjectStates.objectType != null) {
+                                        if (
+                                            sop.Type
+                                            == (SimObjType)
+                                                System.Enum.Parse(
+                                                    typeof(SimObjType),
+                                                    SetObjectStates.objectType
+                                                )
+                                        ) {
+                                            u.UseUp();
+                                        } else {
+                                            continue;
+                                        }
+                                    } else {
                                         u.UseUp();
                                     }
-                                    else
-                                    {
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    u.UseUp();
                                 }
                             }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
             }
 
             actionFinished(true);
@@ -4970,8 +4282,7 @@ public void PutObject(
             bool placeStationary = true,
             int randomSeed = 0,
             bool putNearXY = false
-        )
-        {
+        ) {
             PlaceHeldObject(
                 x: x,
                 y: y,
@@ -4988,8 +4299,7 @@ public void PutObject(
             bool forceAction = false,
             bool placeStationary = true,
             int randomSeed = 0
-        )
-        {
+        ) {
             PlaceHeldObject(
                 objectId: objectId,
                 forceAction: forceAction,
@@ -5010,8 +4320,7 @@ public void PlaceHeldObject(
             bool placeStationary = true,
             int randomSeed = 0,
             bool putNearXY = false
-        )
-        {
+        ) {
             SimObjPhysics targetReceptacle = null;
 
             RaycastHit hit = new RaycastHit();
@@ -5042,8 +4351,7 @@ public void PlaceHeldObject(
             bool forceAction = false,
             bool placeStationary = true,
             int randomSeed = 0
-        )
-        {
+        ) {
             // get the target receptacle based on the action object ID
             SimObjPhysics targetReceptacle = null;
 
@@ -5068,8 +4376,7 @@ private void placeHeldObject(
             bool placeStationary,
             int randomSeed,
             float maxDistance
-        )
-        {
+        ) {
             RaycastHit hit = new RaycastHit();
 
             placeHeldObject(
@@ -5091,22 +4398,19 @@ private void placeHeldObject(
             float maxDistance,
             bool putNearXY,
             RaycastHit hit
-        )
-        {
+        ) {
             // #if UNITY_EDITOR
             // var watch = System.Diagnostics.Stopwatch.StartNew();
             // #endif
 
             // check if we are even holding anything
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 errorMessage = "Can't place an object if Agent isn't holding anything";
                 actionFinished(false);
                 return;
             }
 
-            if (targetReceptacle == null)
-            {
+            if (targetReceptacle == null) {
                 errorMessage = "No valid Receptacle found";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -5117,8 +4421,7 @@ RaycastHit hit
                 !targetReceptacle.DoesThisObjectHaveThisSecondaryProperty(
                     SimObjSecondaryProperty.Receptacle
                 )
-            )
-            {
+            ) {
                 errorMessage = "This target object is NOT a receptacle!";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -5130,16 +4433,13 @@ RaycastHit hit
                 targetReceptacle.DoesThisObjectHaveThisSecondaryProperty(
                     SimObjSecondaryProperty.CanOpen
                 )
-            )
-            {
+            ) {
                 if (
                     ReceptacleRestrictions.MustBeOpenToPlaceObjectsIn.Contains(
                         targetReceptacle.ObjType
                     )
-                )
-                {
-                    if (!targetReceptacle.GetComponent<CanOpen_Object>().isOpen)
-                    {
+                ) {
+                    if (!targetReceptacle.GetComponent<CanOpen_Object>().isOpen) {
                         errorMessage =
                             "Target openable Receptacle is CLOSED, can't place if target is not open!";
                         Debug.Log(errorMessage);
@@ -5155,19 +4455,16 @@ RaycastHit hit
                 targetReceptacle.DoesThisObjectHaveThisSecondaryProperty(
                     SimObjSecondaryProperty.ObjectSpecificReceptacle
                 )
-            )
-            {
+            ) {
                 ObjectSpecificReceptacle osr =
                     targetReceptacle.GetComponent<ObjectSpecificReceptacle>();
                 if (
                     osr.HasSpecificType(ItemInHand.GetComponent<SimObjPhysics>().ObjType)
                     && !osr.isFull()
-                )
-                {
+                ) {
                     // check spawn area specifically if it's a stove top we are trying to place something in because
                     // they are close together and can overlap and are weird
-                    if (osr.GetComponent<SimObjPhysics>().Type == SimObjType.StoveBurner)
-                    {
+                    if (osr.GetComponent<SimObjPhysics>().Type == SimObjType.StoveBurner) {
                         // PhysicsSceneManager psm = GameObject.Find("PhysicsSceneManager").GetComponent<PhysicsSceneManager>();
                         if (
                             physicsSceneManager.StoveTopCheckSpawnArea(
@@ -5176,8 +4473,7 @@ RaycastHit hit
                                 osr.attachPoint.transform.rotation,
                                 false
                             ) == false
-                        )
-                        {
+                        ) {
                             errorMessage =
                                 "another object's collision is blocking held object from being placed";
                             actionFinished(false);
@@ -5194,15 +4490,10 @@ RaycastHit hit
                     DefaultAgentHand();
                     actionFinished(true);
                     return;
-                }
-                else
-                {
-                    if (osr.attachPoint.transform.childCount > 0 || osr.isFull())
-                    {
+                } else {
+                    if (osr.attachPoint.transform.childCount > 0 || osr.isFull()) {
                         errorMessage = targetReceptacle.name + " is full right now";
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage =
                             ItemInHand.name
                             + " is not a valid Object Type to be placed in "
@@ -5216,21 +4507,17 @@ RaycastHit hit
 
             SimObjPhysics handSOP = ItemInHand.GetComponent<SimObjPhysics>();
 
-            if (!forceAction)
-            {
+            if (!forceAction) {
                 // check if the item we are holding can even be placed in the action.ObjectID target at all
                 foreach (
                     KeyValuePair<
                         SimObjType,
                         List<SimObjType>
                     > res in ReceptacleRestrictions.PlacementRestrictions
-                )
-                {
+                ) {
                     // find the Object Type in the PlacementRestrictions dictionary
-                    if (res.Key == handSOP.ObjType)
-                    {
-                        if (!res.Value.Contains(targetReceptacle.ObjType))
-                        {
+                    if (res.Key == handSOP.ObjType) {
+                        if (!res.Value.Contains(targetReceptacle.ObjType)) {
                             errorMessage =
                                 ItemInHand.name
                                 + " cannot be placed in "
@@ -5246,15 +4533,13 @@ RaycastHit hit
             bool onlyPointsCloseToAgent = !forceAction;
             // if the target is something like a pot or bowl on a table, return all valid points instead of ONLY visible points since
             // the Agent can't see the bottom of the receptacle if it's placed too high on a table
-            if (ReceptacleRestrictions.ReturnAllPoints.Contains(targetReceptacle.ObjType))
-            {
+            if (ReceptacleRestrictions.ReturnAllPoints.Contains(targetReceptacle.ObjType)) {
                 onlyPointsCloseToAgent = false;
             }
 
             bool placeUpright = false;
             // check if the object should be forced to only check upright placement angles (this prevents things like Pots being placed sideways)
-            if (ReceptacleRestrictions.AlwaysPlaceUpright.Contains(handSOP.ObjType))
-            {
+            if (ReceptacleRestrictions.AlwaysPlaceUpright.Contains(handSOP.ObjType)) {
                 placeUpright = true;
             }
 
@@ -5265,13 +4550,11 @@ RaycastHit hit
             List<ReceptacleSpawnPoint> spawnPoints = targetReceptacle.ReturnMySpawnPoints(
                 onlyPointsCloseToAgent ? this : null
             );
-            if (randomSeed != 0 || putNearXY)
-            {
+            if (randomSeed != 0 || putNearXY) {
                 List<KeyValuePair<ReceptacleSpawnPoint, float>> distSpawnPoints =
                     new List<KeyValuePair<ReceptacleSpawnPoint, float>>();
 
-                foreach (ReceptacleSpawnPoint sp in spawnPoints)
-                {
+                foreach (ReceptacleSpawnPoint sp in spawnPoints) {
                     // calculate distance from potential spawn point to the agent's current x/z coordinate. Compare using the spawn point's y value so
                     // we compare distance as a flat plane parallel to the agent's x/z plane. This keeps things consistent regardless of agent camera
                     // position if the agent is crouching or standing
@@ -5280,11 +4563,9 @@ RaycastHit hit
                         sp.Point.y,
                         transform.position.z
                     );
-                    if (Vector3.Distance(sp.Point, tmp) < maxDistance)
-                    {
+                    if (Vector3.Distance(sp.Point, tmp) < maxDistance) {
                         float dist = 0;
-                        if (putNearXY)
-                        {
+                        if (putNearXY) {
                             dist = Vector3.Distance(sp.Point, hit.point);
                         }
                         distSpawnPoints.Add(
@@ -5294,18 +4575,14 @@ RaycastHit hit
                 }
 
                 // actually sort by distance closest to raycast hit if needed here, otherwise leave random
-                if (putNearXY)
-                {
+                if (putNearXY) {
                     distSpawnPoints.Sort((x, y) => (x.Value.CompareTo(y.Value)));
-                }
-                else
-                {
+                } else {
                     distSpawnPoints.Shuffle_(randomSeed);
                 }
 
                 spawnPoints = new List<ReceptacleSpawnPoint>(); // populate a new spawnPoints list with sorted keys
-                foreach (KeyValuePair<ReceptacleSpawnPoint, float> pair in distSpawnPoints)
-                {
+                foreach (KeyValuePair<ReceptacleSpawnPoint, float> pair in distSpawnPoints) {
                     spawnPoints.Add(pair.Key);
                 }
             }
@@ -5319,14 +4596,11 @@ RaycastHit hit
                     90,
                     placeUpright
                 )
-            )
-            {
+            ) {
                 ItemInHand = null;
                 DefaultAgentHand();
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No valid positions to place object found";
                 actionFinished(false);
             }
@@ -5343,30 +4617,25 @@ protected void pickupObject(
             bool forceAction,
             bool manualInteract,
             bool markActionFinished
-        )
-        {
-            if (target == null)
-            {
+        ) {
+            if (target == null) {
                 throw new ArgumentNullException();
             }
 
             // found non-pickupable object
-            if (target.PrimaryProperty != SimObjPrimaryProperty.CanPickup)
-            {
+            if (target.PrimaryProperty != SimObjPrimaryProperty.CanPickup) {
                 throw new InvalidOperationException(
                     target.objectID + " must have the property CanPickup to be picked up."
                 );
             }
 
             // agent is holding something
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 throw new InvalidOperationException(
                     "Agent hand has something in it already! Can't pick up anything else"
                 );
             }
-            if (!IsHandDefault)
-            {
+            if (!IsHandDefault) {
                 throw new InvalidOperationException(
                     "Must reset Hand to default position before attempting to Pick Up objects"
                 );
@@ -5387,22 +4656,18 @@ bool markActionFinished
 
             // run this to pickup any contained objects if object is a receptacle
             // if the target is rotated too much, don't try to pick up any contained objects since they would fall out
-            if (Vector3.Angle(target.transform.up, Vector3.up) < 60)
-            {
+            if (Vector3.Angle(target.transform.up, Vector3.up) < 60) {
                 PickupContainedObjects(target);
             }
 
-            if (!manualInteract)
-            {
+            if (!manualInteract) {
                 // by default, abstract agent hand pickup so that object teleports to hand and changes orientation to match agent
 
                 // agent's hand is in default position in front of camera, teleport object into agent's hand
                 target.transform.position = AgentHand.transform.position;
                 // target.transform.rotation = AgentHand.transform.rotation; - keep this line if we ever want to change the pickup position to be constant relative to the Agent Hand and Agent Camera rather than aligned by world axis
                 target.transform.rotation = transform.rotation;
-            }
-            else
-            {
+            } else {
                 // in manualInteract mode, move the hand to the object, and require agent hand manipulation to move object around
                 // or move closer to agent
 
@@ -5413,8 +4678,7 @@ bool markActionFinished
             target.transform.SetParent(AgentHand.transform);
             ItemInHand = target.gameObject;
 
-            if (!forceAction && isHandObjectColliding(true) && !manualInteract)
-            {
+            if (!forceAction && isHandObjectColliding(true) && !manualInteract) {
                 // Undo picking up the object if the object is colliding with something after picking it up
                 target.GetComponent<Rigidbody>().isKinematic = wasKinematic;
                 target.transform.position = savedPos;
@@ -5429,14 +4693,12 @@ bool markActionFinished
 
             // we have successfully picked up something!
             target.isInAgentHand = true;
-            if (markActionFinished)
-            {
+            if (markActionFinished) {
                 actionFinished(success: true, actionReturn: target.ObjectID);
             }
         }
 
-        public void GetDoorHandle(string objectId)
-        {
+        public void GetDoorHandle(string objectId) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
@@ -5444,17 +4706,14 @@ public void GetDoorHandle(string objectId)
 
             List<Vector3> doorHandlePositions = new List<Vector3>();
 
-            foreach (Transform child in target.transform.GetComponentsInChildren<Transform>())
-            {
-                if (child.CompareTag("Handle"))
-                {
+            foreach (Transform child in target.transform.GetComponentsInChildren<Transform>()) {
+                if (child.CompareTag("Handle")) {
                     doorHandlePositions.Add(child.transform.position);
                 }
             }
 
 #if UNITY_EDITOR
-            foreach (Vector3 v in doorHandlePositions)
-            {
+            foreach (Vector3 v in doorHandlePositions) {
                 Debug.Log(v);
             }
 #endif
@@ -5462,8 +4721,7 @@ public void GetDoorHandle(string objectId)
             actionFinished(true, doorHandlePositions);
         }
 
-        public void GetDoorHinge(string objectId)
-        {
+        public void GetDoorHinge(string objectId) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: true
@@ -5471,17 +4729,14 @@ public void GetDoorHinge(string objectId)
 
             List<Vector3> hingePositions = new List<Vector3>();
 
-            foreach (Transform child in target.transform.GetComponentsInChildren<Transform>())
-            {
-                if (child.CompareTag("Hinge"))
-                {
+            foreach (Transform child in target.transform.GetComponentsInChildren<Transform>()) {
+                if (child.CompareTag("Hinge")) {
                     hingePositions.Add(child.transform.position);
                 }
             }
 
 #if UNITY_EDITOR
-            foreach (Vector3 v in hingePositions)
-            {
+            foreach (Vector3 v in hingePositions) {
                 Debug.Log(v);
             }
 #endif
@@ -5494,8 +4749,7 @@ public virtual void PickupObject(
             float y,
             bool forceAction = false,
             bool manualInteract = false
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromXY(
                 x: x,
                 y: y,
@@ -5513,8 +4767,7 @@ public virtual void PickupObject(
             string objectId,
             bool forceAction = false,
             bool manualInteract = false
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: forceAction
@@ -5528,26 +4781,20 @@ public virtual void PickupObject(
         }
 
         // make sure not to pick up any sliced objects because those should remain uninteractable i they have been sliced
-        public void PickupContainedObjects(SimObjPhysics target)
-        {
-            if (target.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-            {
-                foreach (SimObjPhysics sop in target.SimObjectsContainedByReceptacle)
-                {
+        public void PickupContainedObjects(SimObjPhysics target) {
+            if (target.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
+                foreach (SimObjPhysics sop in target.SimObjectsContainedByReceptacle) {
                     // for every object that is contained by this object...first make sure it's pickupable so we don't like, grab a Chair if it happened to be in the receptacle box or something
                     // turn off the colliders (so contained object doesn't block movement), leaving Trigger Colliders active (this is important to maintain visibility!)
-                    if (sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup)
-                    {
+                    if (sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup) {
                         // wait! check if this object is sliceable and is sliced, if so SKIP!
                         if (
                             sop.DoesThisObjectHaveThisSecondaryProperty(
                                 SimObjSecondaryProperty.CanBeSliced
                             )
-                        )
-                        {
+                        ) {
                             // if this object is sliced, don't pick it up because it is effectively disabled
-                            if (sop.GetComponent<SliceObject>().IsSliced())
-                            {
+                            if (sop.GetComponent<SliceObject>().IsSliced()) {
                                 target.RemoveFromContainedObjectReferences(sop);
                                 break;
                             }
@@ -5601,16 +4848,13 @@ public void PickupContainedObjects(SimObjPhysics target)
         //     actionFinished(true);
         // }
 
-        private IEnumerator checkDropHeldObjectActionFast(SimObjPhysics currentHandSimObj)
-        {
-            if (currentHandSimObj != null)
-            {
+        private IEnumerator checkDropHeldObjectActionFast(SimObjPhysics currentHandSimObj) {
+            if (currentHandSimObj != null) {
                 Rigidbody rb = currentHandSimObj.GetComponentInChildren<Rigidbody>();
                 Physics.autoSimulation = false;
                 yield return null;
 
-                for (int i = 0; i < 100; i++)
-                {
+                for (int i = 0; i < 100; i++) {
                     PhysicsSceneManager.PhysicsSimulateTHOR(0.04f);
 #if UNITY_EDITOR
                     yield return null;
@@ -5618,8 +4862,7 @@ private IEnumerator checkDropHeldObjectActionFast(SimObjPhysics currentHandSimOb
                     if (
                         Math.Abs(rb.angularVelocity.sqrMagnitude + rb.velocity.sqrMagnitude)
                         < 0.00001
-                    )
-                    {
+                    ) {
                         break;
                     }
                 }
@@ -5630,18 +4873,15 @@ private IEnumerator checkDropHeldObjectActionFast(SimObjPhysics currentHandSimOb
             actionFinished(true);
         }
 
-        public void DropHeldObject(bool forceAction = false, bool autoSimulation = true)
-        {
+        public void DropHeldObject(bool forceAction = false, bool autoSimulation = true) {
             // make sure something is actually in our hands
-            if (ItemInHand == null)
-            {
+            if (ItemInHand == null) {
                 throw new InvalidOperationException("Nothing is in the agent's hand to drop!");
             }
 
             // we do need this to check if the item is currently colliding with the agent, otherwise
             // dropping an object while it is inside the agent will cause it to shoot out weirdly
-            if (!forceAction && isHandObjectColliding(false))
-            {
+            if (!forceAction && isHandObjectColliding(false)) {
                 throw new InvalidOperationException(
                     $"{ItemInHand.transform.name} can't be dropped. "
                         + "It must be clear of all other collision first, including the Agent."
@@ -5658,12 +4898,9 @@ public void DropHeldObject(bool forceAction = false, bool autoSimulation = true)
             rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
 
             GameObject topObject = GameObject.Find("Objects");
-            if (topObject != null)
-            {
+            if (topObject != null) {
                 ItemInHand.transform.parent = topObject.transform;
-            }
-            else
-            {
+            } else {
                 ItemInHand.transform.parent = null;
             }
             ItemInHand
@@ -5672,27 +4909,21 @@ public void DropHeldObject(bool forceAction = false, bool autoSimulation = true)
 
             // if physics simulation has been paused by the PausePhysicsAutoSim() action,
             // don't do any coroutine checks
-            if (!physicsSceneManager.physicsSimulationPaused)
-            {
+            if (!physicsSceneManager.physicsSimulationPaused) {
                 // this is true by default
-                if (autoSimulation)
-                {
+                if (autoSimulation) {
                     StartCoroutine(
                         checkIfObjectHasStoppedMoving(
                             sop: ItemInHand.GetComponent<SimObjPhysics>(),
                             useTimeout: false
                         )
                     );
-                }
-                else
-                {
+                } else {
                     StartCoroutine(
                         checkDropHeldObjectActionFast(ItemInHand.GetComponent<SimObjPhysics>())
                     );
                 }
-            }
-            else
-            {
+            } else {
                 DefaultAgentHand();
                 actionFinished(true);
             }
@@ -5704,8 +4935,7 @@ public void DropHeldObject(bool forceAction = false, bool autoSimulation = true)
             message: "This action is deprecated. Call DropHeldObject instead.",
             error: false
         )]
-        public void DropHandObject(bool forceAction = false, bool autoSimulation = true)
-        {
+        public void DropHandObject(bool forceAction = false, bool autoSimulation = true) {
             DropHeldObject(forceAction: forceAction, autoSimulation: autoSimulation);
         }
 
@@ -5715,10 +4945,8 @@ public void ThrowObject(
             float moveMagnitude,
             bool forceAction = false,
             bool autoSimulation = true
-        )
-        {
-            if (ItemInHand == null)
-            {
+        ) {
+            if (ItemInHand == null) {
                 throw new InvalidOperationException("Nothing in Hand to Throw!");
             }
 
@@ -5734,32 +4962,27 @@ public void ThrowObject(
         }
 
         // Hide and Seek helper function, makes overlap box at x,z coordinates
-        protected HashSet<SimObjPhysics> objectsInBox(float x, float z)
-        {
+        protected HashSet<SimObjPhysics> objectsInBox(float x, float z) {
             Collider[] colliders = Physics.OverlapBox(
                 new Vector3(x, 0f, z),
                 new Vector3(0.125f, 10f, 0.125f),
                 Quaternion.identity
             );
             HashSet<SimObjPhysics> toReturn = new HashSet<SimObjPhysics>();
-            foreach (Collider c in colliders)
-            {
+            foreach (Collider c in colliders) {
                 SimObjPhysics so = ancestorSimObjPhysics(c.transform.gameObject);
-                if (so != null)
-                {
+                if (so != null) {
                     toReturn.Add(so);
                 }
             }
             return toReturn;
         }
 
-        public void ObjectsInBox(float x, float z)
-        {
+        public void ObjectsInBox(float x, float z) {
             HashSet<SimObjPhysics> objects = objectsInBox(x, z);
             objectIdsInBox = new string[objects.Count];
             int i = 0;
-            foreach (SimObjPhysics so in objects)
-            {
+            foreach (SimObjPhysics so in objects) {
                 objectIdsInBox[i] = so.ObjectID;
                 i++;
 #if UNITY_EDITOR
@@ -5770,22 +4993,17 @@ public void ObjectsInBox(float x, float z)
         }
 
         // try and close all visible objects
-        public void CloseVisibleObjects(bool simplifyPhysics = false)
-        {
+        public void CloseVisibleObjects(bool simplifyPhysics = false) {
             OpenVisibleObjects(simplifyPhysics: simplifyPhysics, openness: 0);
         }
 
         // try and open all visible objects
-        public void OpenVisibleObjects(bool simplifyPhysics = false, float openness = 1)
-        {
-            foreach (SimObjPhysics so in GetAllVisibleSimObjPhysics(m_Camera, maxVisibleDistance))
-            {
+        public void OpenVisibleObjects(bool simplifyPhysics = false, float openness = 1) {
+            foreach (SimObjPhysics so in GetAllVisibleSimObjPhysics(m_Camera, maxVisibleDistance)) {
                 CanOpen_Object coo = so.GetComponent<CanOpen_Object>();
-                if (coo)
-                {
+                if (coo) {
                     // if object is open, add it to be closed.
-                    if (!coo.isOpen)
-                    {
+                    if (!coo.isOpen) {
                         openObject(
                             target: so,
                             openness: openness,
@@ -5810,8 +5028,7 @@ public void CloseObject(
             bool stopAtNonStaticCol = false,
             float? physicsInterval = null,
             bool useGripper = false
-        )
-        {
+        ) {
             OpenObject(
                 objectId: objectId,
                 openness: 0,
@@ -5825,8 +5042,7 @@ public void CloseObject(
         }
 
         // syntactic sugar for open object with openness = 0.
-        public void CloseObject(float x, float y, bool forceAction = false)
-        {
+        public void CloseObject(float x, float y, bool forceAction = false) {
             OpenObject(x: x, y: y, forceAction: forceAction, openness: 0);
         }
 
@@ -5836,8 +5052,7 @@ protected SimObjPhysics getOpenableOrCloseableObjectNearLocation(
             float y,
             float radius,
             bool forceAction
-        )
-        {
+        ) {
             y = 1.0f - y;
 
             RaycastHit hit;
@@ -5849,25 +5064,20 @@ bool forceAction
                 "Procedural0",
                 "SimObjInvisible"
             );
-            if (ItemInHand != null)
-            {
-                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>())
-                {
+            if (ItemInHand != null) {
+                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>()) {
                     c.enabled = false;
                 }
             }
-            for (int i = 0; i < 10; i++)
-            {
+            for (int i = 0; i < 10; i++) {
                 float r = radius * (i / 9.0f);
                 int n = 2 * i + 1;
-                for (int j = 0; j < n; j++)
-                {
+                for (int j = 0; j < n; j++) {
                     float thetak = 2 * j * ((float)Math.PI) / n;
 
                     float newX = x + (float)(r * Math.Cos(thetak));
                     float newY = y + (float)(r * Math.Sin(thetak));
-                    if (x < 0 || x > 1.0 || y < 0 || y > 1.0)
-                    {
+                    if (x < 0 || x > 1.0 || y < 0 || y > 1.0) {
                         continue;
                     }
 
@@ -5875,31 +5085,25 @@ bool forceAction
                     bool raycastDidHit = Physics.Raycast(ray, out hit, 10f, layerMask);
 
 #if UNITY_EDITOR
-                    if (raycastDidHit)
-                    {
+                    if (raycastDidHit) {
                         Debug.DrawLine(ray.origin, hit.point, Color.red, 10f);
                     }
 #endif
 
-                    if (raycastDidHit)
-                    {
+                    if (raycastDidHit) {
                         SimObjPhysics sop = ancestorSimObjPhysics(hit.transform.gameObject);
                         if (
                             sop != null
                             && sop.GetComponent<CanOpen_Object>()
                             && (forceAction || objectIsCurrentlyVisible(sop, maxVisibleDistance))
-                        )
-                        {
+                        ) {
                             CanOpen_Object coo = sop.GetComponent<CanOpen_Object>();
 
-                            if (open != coo.isOpen)
-                            {
-                                if (ItemInHand != null)
-                                {
+                            if (open != coo.isOpen) {
+                                if (ItemInHand != null) {
                                     foreach (
                                         Collider c in ItemInHand.GetComponentsInChildren<Collider>()
-                                    )
-                                    {
+                                    ) {
                                         c.enabled = true;
                                     }
                                 }
@@ -5909,10 +5113,8 @@ Collider c in ItemInHand.GetComponentsInChildren<Collider>()
                     }
                 }
             }
-            if (ItemInHand != null)
-            {
-                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>())
-                {
+            if (ItemInHand != null) {
+                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>()) {
                     c.enabled = true;
                 }
             }
@@ -5920,8 +5122,7 @@ Collider c in ItemInHand.GetComponentsInChildren<Collider>()
         }
 
         // H&S action
-        private void OpenOrCloseObjectAtLocation(bool open, ServerAction action)
-        {
+        private void OpenOrCloseObjectAtLocation(bool open, ServerAction action) {
             float x = action.x;
             float y = 1.0f - action.y;
             Ray ray = m_Camera.ViewportPointToRay(new Vector3(x, y, 0.0f));
@@ -5934,23 +5135,18 @@ private void OpenOrCloseObjectAtLocation(bool open, ServerAction action)
                 "Procedural0",
                 "SimObjInvisible"
             );
-            if (ItemInHand != null)
-            {
-                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>())
-                {
+            if (ItemInHand != null) {
+                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>()) {
                     c.enabled = false;
                 }
             }
             bool raycastDidHit = Physics.Raycast(ray, out hit, 10f, layerMask);
-            if (ItemInHand != null)
-            {
-                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>())
-                {
+            if (ItemInHand != null) {
+                foreach (Collider c in ItemInHand.GetComponentsInChildren<Collider>()) {
                     c.enabled = true;
                 }
             }
-            if (!raycastDidHit)
-            {
+            if (!raycastDidHit) {
                 Debug.Log("There don't seem to be any objects in that area.");
                 errorMessage = "No openable object at location.";
                 actionFinished(false);
@@ -5960,34 +5156,24 @@ private void OpenOrCloseObjectAtLocation(bool open, ServerAction action)
             if (
                 so != null
                 && (action.forceAction || objectIsCurrentlyVisible(so, maxVisibleDistance))
-            )
-            {
-                if (open)
-                {
+            ) {
+                if (open) {
                     OpenObject(objectId: so.ObjectID, forceAction: true);
-                }
-                else
-                {
+                } else {
                     CloseObject(objectId: so.ObjectID, forceAction: true);
                 }
-            }
-            else if (so == null)
-            {
+            } else if (so == null) {
                 errorMessage = "Object at location is not interactable.";
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 errorMessage = so.ObjectID + " is too far away.";
                 actionFinished(false);
             }
         }
 
         // H&S action
-        public void OpenObjectAtLocation(ServerAction action)
-        {
-            if (action.z > 0)
-            {
+        public void OpenObjectAtLocation(ServerAction action) {
+            if (action.z > 0) {
                 SimObjPhysics sop = getOpenableOrCloseableObjectNearLocation(
                     true,
                     action.x,
@@ -5995,71 +5181,56 @@ public void OpenObjectAtLocation(ServerAction action)
                     action.z,
                     false
                 );
-                if (sop != null)
-                {
+                if (sop != null) {
                     OpenObject(objectId: sop.ObjectID, forceAction: true);
-                }
-                else
-                {
+                } else {
                     errorMessage = "No openable object found within a radius about given point.";
                     actionFinished(false);
                 }
-            }
-            else
-            {
+            } else {
                 OpenOrCloseObjectAtLocation(true, action);
             }
         }
 
         // H&S action
-        public void CloseObjectAtLocation(ServerAction action)
-        {
+        public void CloseObjectAtLocation(ServerAction action) {
             OpenOrCloseObjectAtLocation(false, action);
         }
 
         // swap an object's materials out to the cooked version of the object
-        public void CookObject(ServerAction action)
-        {
+        public void CookObject(ServerAction action) {
             // specify target to pickup via objectId or coordinates
-            if (action.forceAction)
-            {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (target)
-            {
-                if (!action.forceAction && !IsInteractable(target))
-                {
+            if (target) {
+                if (!action.forceAction && !IsInteractable(target)) {
                     actionFinished(false);
                     errorMessage =
                         "object is visible but occluded by something: " + action.objectId;
                     return;
                 }
 
-                if (target.GetComponent<CookObject>())
-                {
+                if (target.GetComponent<CookObject>()) {
                     CookObject to = target.GetComponent<CookObject>();
 
                     // is this toasted already? if not, good to go
-                    if (to.IsCooked())
-                    {
+                    if (to.IsCooked()) {
                         actionFinished(false);
                         errorMessage = action.objectId + " is already Toasted!";
                         return;
@@ -6068,17 +5239,14 @@ public void CookObject(ServerAction action)
                     to.Cook();
 
                     actionFinished(true);
-                }
-                else
-                {
+                } else {
                     errorMessage = "target object is not cookable";
                     actionFinished(false);
                     return;
                 }
             }
             // target not found in currently visible objects, report not found
-            else
-            {
+            else {
                 actionFinished(false);
                 errorMessage = "object not found: " + action.objectId;
             }
@@ -6086,8 +5254,7 @@ public void CookObject(ServerAction action)
 
         // face change the agent's face screen to demonstrate different "emotion" states
         // for use with multi agent implicit communication
-        public void ChangeAgentFaceToNeutral()
-        {
+        public void ChangeAgentFaceToNeutral() {
             Material[] currentmats = MyFaceMesh.materials;
 
             currentmats[2] = ScreenFaces[0];
@@ -6097,8 +5264,7 @@ public void ChangeAgentFaceToNeutral()
             actionFinished(true);
         }
 
-        public void ChangeAgentFaceToHappy()
-        {
+        public void ChangeAgentFaceToHappy() {
             Material[] currentmats = MyFaceMesh.materials;
 
             currentmats[2] = ScreenFaces[1];
@@ -6108,8 +5274,7 @@ public void ChangeAgentFaceToHappy()
             actionFinished(true);
         }
 
-        public void ChangeAgentFaceToMad()
-        {
+        public void ChangeAgentFaceToMad() {
             Material[] currentmats = MyFaceMesh.materials;
 
             currentmats[2] = ScreenFaces[2];
@@ -6119,8 +5284,7 @@ public void ChangeAgentFaceToMad()
             actionFinished(true);
         }
 
-        public void ChangeAgentFaceToSuperMad()
-        {
+        public void ChangeAgentFaceToSuperMad() {
             Material[] currentmats = MyFaceMesh.materials;
 
             currentmats[2] = ScreenFaces[3];
@@ -6130,28 +5294,23 @@ public void ChangeAgentFaceToSuperMad()
             actionFinished(true);
         }
 
-        public void ToggleObjectOn(string objectId, bool forceAction = false)
-        {
+        public void ToggleObjectOn(string objectId, bool forceAction = false) {
             toggleObject(objectId, true, forceAction);
         }
 
-        public void ToggleObjectOff(string objectId, bool forceAction = false)
-        {
+        public void ToggleObjectOff(string objectId, bool forceAction = false) {
             toggleObject(objectId, false, forceAction);
         }
 
-        public void ToggleObjectOn(float x, float y, bool forceAction = false)
-        {
+        public void ToggleObjectOn(float x, float y, bool forceAction = false) {
             toggleObject(x, y, true, forceAction);
         }
 
-        public void ToggleObjectOff(float x, float y, bool forceAction = false)
-        {
+        public void ToggleObjectOff(float x, float y, bool forceAction = false) {
             toggleObject(x, y, false, forceAction);
         }
 
-        private void toggleObject(float x, float y, bool toggleOn, bool forceAction)
-        {
+        private void toggleObject(float x, float y, bool toggleOn, bool forceAction) {
             SimObjPhysics target = getInteractableSimObjectFromXY(
                 x: x,
                 y: y,
@@ -6160,15 +5319,13 @@ private void toggleObject(float x, float y, bool toggleOn, bool forceAction)
             toggleObject(target, toggleOn, forceAction);
         }
 
-        private void toggleObject(string objectId, bool toggleOn, bool forceAction)
-        {
+        private void toggleObject(string objectId, bool toggleOn, bool forceAction) {
             SimObjPhysics target = null;
 
             // if object is in the scene and visible, assign it to 'target'
             target = getInteractableSimObjectFromId(objectId: objectId, forceAction: forceAction);
 
-            if (!target)
-            {
+            if (!target) {
                 // target not found in currently visible objects, report not found
                 errorMessage = "object not found: " + objectId;
                 actionFinished(false);
@@ -6179,30 +5336,24 @@ private void toggleObject(string objectId, bool toggleOn, bool forceAction)
         }
 
         // specific ToggleObject that is used for SetObjectStatesForLotsOfObjects
-        private IEnumerator toggleObject(SimObjPhysics target, bool toggleOn)
-        {
-            if (target.GetComponent<CanToggleOnOff>())
-            {
+        private IEnumerator toggleObject(SimObjPhysics target, bool toggleOn) {
+            if (target.GetComponent<CanToggleOnOff>()) {
                 // get CanToggleOnOff component from target
                 CanToggleOnOff ctof = target.GetComponent<CanToggleOnOff>();
 
-                if (!ctof.ReturnSelfControlled())
-                {
+                if (!ctof.ReturnSelfControlled()) {
                     yield break;
                 }
 
                 // if the object is already in the state specified by the toggleOn bool, do nothing
-                if (ctof.isOn == toggleOn)
-                {
+                if (ctof.isOn == toggleOn) {
                     yield break;
                 }
 
                 // if object needs to be closed to turn on...
-                if (toggleOn && ctof.ReturnMustBeClosedToTurnOn().Contains(target.Type))
-                {
+                if (toggleOn && ctof.ReturnMustBeClosedToTurnOn().Contains(target.Type)) {
                     // if the object is open and we are trying to turn it on, do nothing because it can't
-                    if (target.GetComponent<CanOpen_Object>().isOpen)
-                    {
+                    if (target.GetComponent<CanOpen_Object>().isOpen) {
                         yield break;
                     }
                 }
@@ -6211,21 +5362,17 @@ private IEnumerator toggleObject(SimObjPhysics target, bool toggleOn)
             }
         }
 
-        private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction)
-        {
-            if (!forceAction && !IsInteractable(target))
-            {
+        private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction) {
+            if (!forceAction && !IsInteractable(target)) {
                 errorMessage = "object is visible but occluded by something: " + target.ObjectID;
                 actionFinished(false);
                 return false;
             }
 
-            if (target.GetComponent<CanToggleOnOff>())
-            {
+            if (target.GetComponent<CanToggleOnOff>()) {
                 CanToggleOnOff ctof = target.GetComponent<CanToggleOnOff>();
 
-                if (!ctof.ReturnSelfControlled())
-                {
+                if (!ctof.ReturnSelfControlled()) {
                     errorMessage =
                         "target object is controlled by another sim object. target object cannot be turned on/off directly";
                     actionFinished(false);
@@ -6233,14 +5380,10 @@ private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction)
                 }
 
                 // check to make sure object is in other state
-                if (ctof.isOn == toggleOn)
-                {
-                    if (ctof.isOn)
-                    {
+                if (ctof.isOn == toggleOn) {
+                    if (ctof.isOn) {
                         errorMessage = "can't toggle object on if it's already on!";
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = "can't toggle object off if it's already off!";
                     }
 
@@ -6248,10 +5391,8 @@ private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction)
                     return false;
                 }
                 // check if this object needs to be closed in order to turn on
-                if (toggleOn && ctof.ReturnMustBeClosedToTurnOn().Contains(target.Type))
-                {
-                    if (target.GetComponent<CanOpen_Object>().isOpen)
-                    {
+                if (toggleOn && ctof.ReturnMustBeClosedToTurnOn().Contains(target.Type)) {
+                    if (target.GetComponent<CanOpen_Object>().isOpen) {
                         errorMessage = "Target must be closed to Toggle On!";
                         actionFinished(false);
                         return false;
@@ -6264,11 +5405,9 @@ private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction)
                     && target.DoesThisObjectHaveThisSecondaryProperty(
                         SimObjSecondaryProperty.CanBreak
                     )
-                )
-                {
+                ) {
                     // if this breakable object is broken, we can't turn it on
-                    if (target.IsBroken)
-                    {
+                    if (target.IsBroken) {
                         errorMessage = "Target is broken and cannot be Toggled On!";
                         actionFinished(false);
                         return false;
@@ -6278,21 +5417,17 @@ private bool toggleObject(SimObjPhysics target, bool toggleOn, bool forceAction)
                 // interact then wait
                 StartCoroutine(ToggleAndWait(ctof));
                 return true;
-            }
-            else
-            {
+            } else {
                 errorMessage = "object is not toggleable.";
                 actionFinished(false);
                 return false;
             }
         }
 
-        protected IEnumerator ToggleAndWait(CanToggleOnOff ctof)
-        {
+        protected IEnumerator ToggleAndWait(CanToggleOnOff ctof) {
             bool ctofInitialState = ctof.isOn;
 
-            if (ctof != null)
-            {
+            if (ctof != null) {
                 ctof.Toggle();
             }
 
@@ -6308,8 +5443,7 @@ protected IEnumerator ToggleAndWait(CanToggleOnOff ctof)
             );
             success = true;
 
-            if (!success)
-            {
+            if (!success) {
                 errorMessage = "object could not be toggled on/off succesfully";
             }
 
@@ -6319,10 +5453,8 @@ protected IEnumerator ToggleAndWait(CanToggleOnOff ctof)
         }
 
         // XXX: This will return contained objects, but should not be used. Likely depracate this later
-        public void Contains(ServerAction action)
-        {
-            if (action.objectId == null)
-            {
+        public void Contains(ServerAction action) {
+            if (action.objectId == null) {
                 errorMessage = "Hey, actually give me an object ID check containment for, yeah?";
                 actionFinished(false);
                 return;
@@ -6333,21 +5465,17 @@ public void Contains(ServerAction action)
                 forceAction: action.forceAction
             );
 
-            if (target)
-            {
+            if (target) {
                 List<string> ids = target.GetAllSimObjectsInReceptacleTriggersByObjectID();
 
 #if UNITY_EDITOR
-                foreach (string s in ids)
-                {
+                foreach (string s in ids) {
                     Debug.Log(s);
                 }
 #endif
 
                 actionFinished(true, ids.ToArray());
-            }
-            else
-            {
+            } else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
@@ -6366,44 +5494,35 @@ public void Contains(ServerAction action)
         private Dictionary<int, Material[]> maskedGameObjectDict =
             new Dictionary<int, Material[]>();
 
-        private void maskGameObject(GameObject go, Material mat)
-        {
-            if (go.name == "Objects" || go.name == "Structure")
-            {
+        private void maskGameObject(GameObject go, Material mat) {
+            if (go.name == "Objects" || go.name == "Structure") {
                 return;
             }
-            foreach (MeshRenderer r in go.GetComponentsInChildren<MeshRenderer>() as MeshRenderer[])
-            {
+            foreach (MeshRenderer r in go.GetComponentsInChildren<MeshRenderer>() as MeshRenderer[]) {
                 int id = r.GetInstanceID();
-                if (!maskedGameObjectDict.ContainsKey(id))
-                {
+                if (!maskedGameObjectDict.ContainsKey(id)) {
                     maskedGameObjectDict[id] = r.materials;
                 }
 
                 Material[] newMaterials = new Material[r.materials.Length];
-                for (int i = 0; i < newMaterials.Length; i++)
-                {
+                for (int i = 0; i < newMaterials.Length; i++) {
                     newMaterials[i] = new Material(mat);
                 }
                 r.materials = newMaterials;
             }
         }
 
-        private void unmaskGameObject(GameObject go)
-        {
-            foreach (MeshRenderer r in go.GetComponentsInChildren<MeshRenderer>() as MeshRenderer[])
-            {
+        private void unmaskGameObject(GameObject go) {
+            foreach (MeshRenderer r in go.GetComponentsInChildren<MeshRenderer>() as MeshRenderer[]) {
                 int id = r.GetInstanceID();
-                if (maskedGameObjectDict.ContainsKey(id))
-                {
+                if (maskedGameObjectDict.ContainsKey(id)) {
                     r.materials = maskedGameObjectDict[id];
                     maskedGameObjectDict.Remove(id);
                 }
             }
         }
 
-        public void MaskMovingParts()
-        {
+        public void MaskMovingParts() {
             Material openMaterial = new Material(Shader.Find("Unlit/Color"));
             openMaterial.color = Color.magenta;
             Material closedMaterial = new Material(Shader.Find("Unlit/Color"));
@@ -6411,34 +5530,26 @@ public void MaskMovingParts()
             Material otherMaterial = new Material(Shader.Find("Unlit/Color"));
             otherMaterial.color = Color.green;
 
-            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-            {
+            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
                 maskGameObject(go, otherMaterial);
             }
 
-            foreach (CanOpen_Object coo in GameObject.FindObjectsOfType<CanOpen_Object>())
-            {
+            foreach (CanOpen_Object coo in GameObject.FindObjectsOfType<CanOpen_Object>()) {
                 Material m;
-                if (coo.isOpen)
-                {
+                if (coo.isOpen) {
                     m = openMaterial;
-                }
-                else
-                {
+                } else {
                     m = closedMaterial;
                 }
-                foreach (GameObject go in coo.MovingParts)
-                {
+                foreach (GameObject go in coo.MovingParts) {
                     maskGameObject(go, m);
                 }
             }
             actionFinished(true);
         }
 
-        public void UnmaskMovingParts()
-        {
-            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-            {
+        public void UnmaskMovingParts() {
+            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
                 unmaskGameObject(go);
             }
             // foreach (CanOpen_Object coo in GameObject.FindObjectsOfType<CanOpen_Object>()) {
@@ -6449,35 +5560,27 @@ public void UnmaskMovingParts()
             actionFinished(true);
         }
 
-        private void HideAll()
-        {
-            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-            {
+        private void HideAll() {
+            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
                 UpdateDisplayGameObject(go, false);
             }
         }
 
-        private void UnhideAll()
-        {
-            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-            {
+        private void UnhideAll() {
+            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
                 UpdateDisplayGameObject(go, true);
             }
             // Making sure the agents visibility capsules are not incorrectly unhidden
-            foreach (BaseFPSAgentController agent in this.agentManager.agents)
-            {
+            foreach (BaseFPSAgentController agent in this.agentManager.agents) {
                 agent.IsVisible = agent.IsVisible;
             }
         }
 
-        public void HideAllObjectsExcept(ServerAction action)
-        {
-            foreach (GameObject go in UnityEngine.Object.FindObjectsOfType<GameObject>())
-            {
+        public void HideAllObjectsExcept(ServerAction action) {
+            foreach (GameObject go in UnityEngine.Object.FindObjectsOfType<GameObject>()) {
                 UpdateDisplayGameObject(go, false);
             }
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 UpdateDisplayGameObject(
                     physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId].gameObject,
                     true
@@ -6486,45 +5589,37 @@ public void HideAllObjectsExcept(ServerAction action)
             actionFinished(true);
         }
 
-        public void HideTranslucentObjects()
-        {
-            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+        public void HideTranslucentObjects() {
+            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 if (
                     sop.DoesThisObjectHaveThisSecondaryProperty(
                         SimObjSecondaryProperty.CanSeeThrough
                     )
-                )
-                {
+                ) {
                     UpdateDisplayGameObject(sop.gameObject, false);
                 }
             }
             actionFinished(true);
         }
 
-        public void HideTransparentStructureObjects()
-        {
+        public void HideTransparentStructureObjects() {
             transparentStructureObjectsHidden = true;
 
             GameObject structObj = GameObject.Find("Structure");
             GameObject lightObj = GameObject.Find("Lighting");
 
             List<Renderer> renderers = new List<Renderer>();
-            if (structObj != null)
-            {
+            if (structObj != null) {
                 renderers.AddRange(structObj.GetComponentsInChildren<Renderer>());
             }
-            if (lightObj != null)
-            {
+            if (lightObj != null) {
                 renderers.AddRange(lightObj.GetComponentsInChildren<Renderer>());
             }
             // renderers.AddRange(GameObject.FindObjectsOfType<Renderer>());
 
-            foreach (Renderer r in renderers)
-            {
+            foreach (Renderer r in renderers) {
                 bool transparent = true;
-                foreach (Material m in r.materials)
-                {
+                foreach (Material m in r.materials) {
                     if (
                         !(
                             m.IsKeywordEnabled("_ALPHATEST_ON")
@@ -6532,74 +5627,59 @@ public void HideTransparentStructureObjects()
                             || m.IsKeywordEnabled("_ALPHAPREMULTIPLY_ON")
                         )
                         || m.color.a == 1.0f
-                    )
-                    {
+                    ) {
                         transparent = false;
                         break;
                     }
                 }
-                if (transparent)
-                {
+                if (transparent) {
                     UpdateDisplayGameObject(r.gameObject, false);
                 }
             }
         }
 
-        public void UnhideStructureObjects()
-        {
+        public void UnhideStructureObjects() {
             transparentStructureObjectsHidden = false;
 
             GameObject structObj = GameObject.Find("Structure");
             GameObject lightObj = GameObject.Find("Lighting");
 
             List<Transform> transforms = new List<Transform>();
-            if (structObj != null)
-            {
+            if (structObj != null) {
                 transforms.AddRange(structObj.GetComponentsInChildren<Transform>());
             }
-            if (lightObj != null)
-            {
+            if (lightObj != null) {
                 transforms.AddRange(lightObj.GetComponentsInChildren<Transform>());
             }
 
-            foreach (Transform transform in transforms)
-            {
+            foreach (Transform transform in transforms) {
                 UpdateDisplayGameObject(transform.gameObject, true);
             }
         }
 
-        public void HideBlueObjects(ServerAction action)
-        {
-            foreach (Renderer r in UnityEngine.Object.FindObjectsOfType<Renderer>())
-            {
-                foreach (Material m in r.materials)
-                {
-                    if (m.name.Contains("BLUE"))
-                    {
+        public void HideBlueObjects(ServerAction action) {
+            foreach (Renderer r in UnityEngine.Object.FindObjectsOfType<Renderer>()) {
+                foreach (Material m in r.materials) {
+                    if (m.name.Contains("BLUE")) {
                         r.enabled = false;
                         break;
                     }
                 }
             }
 
-            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>())
-            {
-                if (go.name.Contains("BlueCube"))
-                {
+            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>()) {
+                if (go.name.Contains("BlueCube")) {
                     UpdateDisplayGameObject(go, true);
                 }
             }
             actionFinished(true);
         }
 
-        public void GetAwayFromObject(ServerAction action)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void GetAwayFromObject(ServerAction action) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
                 int k = 0;
-                while (isAgentCapsuleCollidingWith(sop.gameObject) && k < 20)
-                {
+                while (isAgentCapsuleCollidingWith(sop.gameObject) && k < 20) {
                     k++;
                     Vector3[] dirs =
                     {
@@ -6614,58 +5694,44 @@ public void GetAwayFromObject(ServerAction action)
                     moveInDirection(dirs[0] * gridSize);
                     sop.gameObject.SetActive(true);
                 }
-                if (isAgentCapsuleCollidingWith(sop.gameObject))
-                {
+                if (isAgentCapsuleCollidingWith(sop.gameObject)) {
                     errorMessage = "Could not get away from " + sop.ObjectID;
                     actionFinished(false);
                     return;
                 }
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No object with given id could be found to disable collisions with.";
                 actionFinished(false);
             }
         }
 
-        public void DisableObjectCollisionWithAgent(ServerAction action)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void DisableObjectCollisionWithAgent(ServerAction action) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
-                foreach (Collider c0 in this.GetComponentsInChildren<Collider>())
-                {
-                    foreach (Collider c1 in sop.GetComponentsInChildren<Collider>())
-                    {
+                foreach (Collider c0 in this.GetComponentsInChildren<Collider>()) {
+                    foreach (Collider c1 in sop.GetComponentsInChildren<Collider>()) {
                         Physics.IgnoreCollision(c0, c1);
                     }
                 }
-                foreach (Collider c1 in sop.GetComponentsInChildren<Collider>())
-                {
+                foreach (Collider c1 in sop.GetComponentsInChildren<Collider>()) {
                     collidersToIgnoreDuringMovement.Add(c1);
                 }
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No object with given id could be found to disable collisions with.";
                 actionFinished(false);
             }
         }
 
-        public void HideObject(string objectId, bool hideContained = true)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void HideObject(string objectId, bool hideContained = true) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
                 if (
                     hideContained
                     && !ReceptacleRestrictions.SpawnOnlyOutsideReceptacles.Contains(sop.ObjType)
-                )
-                {
-                    foreach (SimObjPhysics containedSop in sop.SimObjectsContainedByReceptacle)
-                    {
+                ) {
+                    foreach (SimObjPhysics containedSop in sop.SimObjectsContainedByReceptacle) {
                         UpdateDisplayGameObject(containedSop.gameObject, false);
                     }
                 }
@@ -6673,65 +5739,50 @@ public void HideObject(string objectId, bool hideContained = true)
                 sop.GetAllSimObjectsInReceptacleTriggersByObjectID();
 
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No object with given id could be found to hide.";
                 actionFinished(false);
             }
         }
 
-        public void UnhideObject(string objectId, bool unhideContained = true)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void UnhideObject(string objectId, bool unhideContained = true) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
                 if (
                     unhideContained
                     && !ReceptacleRestrictions.SpawnOnlyOutsideReceptacles.Contains(sop.ObjType)
-                )
-                {
-                    foreach (SimObjPhysics containedSop in sop.SimObjectsContainedByReceptacle)
-                    {
+                ) {
+                    foreach (SimObjPhysics containedSop in sop.SimObjectsContainedByReceptacle) {
                         UpdateDisplayGameObject(containedSop.gameObject, true);
                     }
                 }
                 UpdateDisplayGameObject(sop.gameObject, true);
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No object with given id could be found to unhide.";
                 actionFinished(false);
             }
         }
 
-        public void HideAllObjects(ServerAction action)
-        {
+        public void HideAllObjects(ServerAction action) {
             HideAll();
             actionFinished(true);
         }
 
-        public void UnhideAllObjects(ServerAction action)
-        {
+        public void UnhideAllObjects(ServerAction action) {
             transparentStructureObjectsHidden = false;
             UnhideAll();
             actionFinished(true);
         }
 
-        protected void MaskSimObj(SimObjPhysics so, Material mat)
-        {
-            if (!transparentStructureObjectsHidden)
-            {
+        protected void MaskSimObj(SimObjPhysics so, Material mat) {
+            if (!transparentStructureObjectsHidden) {
                 HideTransparentStructureObjects();
             }
             HashSet<MeshRenderer> renderersToSkip = new HashSet<MeshRenderer>();
-            foreach (SimObjPhysics childSo in so.GetComponentsInChildren<SimObjPhysics>())
-            {
-                if (so.ObjectID != childSo.ObjectID)
-                {
-                    foreach (MeshRenderer mr in childSo.GetComponentsInChildren<MeshRenderer>())
-                    {
+            foreach (SimObjPhysics childSo in so.GetComponentsInChildren<SimObjPhysics>()) {
+                if (so.ObjectID != childSo.ObjectID) {
+                    foreach (MeshRenderer mr in childSo.GetComponentsInChildren<MeshRenderer>()) {
                         renderersToSkip.Add(mr);
                     }
                 }
@@ -6740,29 +5791,23 @@ protected void MaskSimObj(SimObjPhysics so, Material mat)
             foreach (
                 MeshRenderer r in so.gameObject.GetComponentsInChildren<MeshRenderer>()
                     as MeshRenderer[]
-            )
-            {
-                if (!renderersToSkip.Contains(r))
-                {
+            ) {
+                if (!renderersToSkip.Contains(r)) {
                     dict[r.GetInstanceID()] = r.materials;
                     Material[] newMaterials = new Material[r.materials.Length];
-                    for (int i = 0; i < newMaterials.Length; i++)
-                    {
+                    for (int i = 0; i < newMaterials.Length; i++) {
                         newMaterials[i] = new Material(mat);
                     }
                     r.materials = newMaterials;
                 }
             }
-            if (!maskedObjects.ContainsKey(so.ObjectID))
-            {
+            if (!maskedObjects.ContainsKey(so.ObjectID)) {
                 maskedObjects[so.ObjectID] = dict;
             }
         }
 
-        protected void MaskSimObj(SimObjPhysics so, Color color)
-        {
-            if (!transparentStructureObjectsHidden)
-            {
+        protected void MaskSimObj(SimObjPhysics so, Color color) {
+            if (!transparentStructureObjectsHidden) {
                 HideTransparentStructureObjects();
             }
             Material material = new Material(Shader.Find("Unlit/Color"));
@@ -6770,24 +5815,18 @@ protected void MaskSimObj(SimObjPhysics so, Color color)
             MaskSimObj(so, material);
         }
 
-        protected void UnmaskSimObj(SimObjPhysics so)
-        {
-            if (transparentStructureObjectsHidden)
-            {
+        protected void UnmaskSimObj(SimObjPhysics so) {
+            if (transparentStructureObjectsHidden) {
                 UnhideStructureObjects();
             }
 
-            if (maskedObjects.ContainsKey(so.ObjectID))
-            {
+            if (maskedObjects.ContainsKey(so.ObjectID)) {
                 foreach (
                     MeshRenderer r in so.gameObject.GetComponentsInChildren<MeshRenderer>()
                         as MeshRenderer[]
-                )
-                {
-                    if (r != null)
-                    {
-                        if (maskedObjects[so.ObjectID].ContainsKey(r.GetInstanceID()))
-                        {
+                ) {
+                    if (r != null) {
+                        if (maskedObjects[so.ObjectID].ContainsKey(r.GetInstanceID())) {
                             r.materials = maskedObjects[so.ObjectID][r.GetInstanceID()];
                         }
                     }
@@ -6796,23 +5835,20 @@ as MeshRenderer[]
             }
         }
 
-        public void EmphasizeObject(ServerAction action)
-        {
+        public void EmphasizeObject(ServerAction action) {
 #if UNITY_EDITOR
             foreach (
                 KeyValuePair<
                     string,
                     SimObjPhysics
                 > entry in physicsSceneManager.ObjectIdToSimObjPhysics
-            )
-            {
+            ) {
                 Debug.Log(entry.Key);
                 Debug.Log(entry.Key == action.objectId);
             }
 #endif
 
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 HideAll();
                 UpdateDisplayGameObject(
                     physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId].gameObject,
@@ -6823,50 +5859,38 @@ public void EmphasizeObject(ServerAction action)
                     Color.magenta
                 );
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No object with id: " + action.objectId;
                 actionFinished(false);
             }
         }
 
-        public void UnemphasizeAll()
-        {
+        public void UnemphasizeAll() {
             UnhideAll();
-            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 UnmaskSimObj(so);
             }
             actionFinished(true);
         }
 
-        public void MaskObject(ServerAction action)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void MaskObject(ServerAction action) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 MaskSimObj(
                     physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId],
                     Color.magenta
                 );
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No such object with id: " + action.objectId;
                 actionFinished(false);
             }
         }
 
-        public void UnmaskObject(ServerAction action)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void UnmaskObject(ServerAction action) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 UnmaskSimObj(physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId]);
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "No such object with id: " + action.objectId;
                 actionFinished(false);
             }
@@ -6876,13 +5900,11 @@ public void UnmaskObject(ServerAction action)
         ///// GETTING DISTANCES, NORMALS, ETC /////
         ///////////////////////////////////////////
 
-        private bool NormalIsApproximatelyUp(Vector3 normal, float tol = 10f)
-        {
+        private bool NormalIsApproximatelyUp(Vector3 normal, float tol = 10f) {
             return Vector3.Angle(transform.up, normal) < tol;
         }
 
-        private bool AnythingAbovePosition(Vector3 position, float distance)
-        {
+        private bool AnythingAbovePosition(Vector3 position, float distance) {
             Vector3 up = new Vector3(0.0f, 1.0f, 0.0f);
             RaycastHit hit;
             return Physics.Raycast(position, up, out hit, distance);
@@ -6893,29 +5915,22 @@ private bool AnythingAbovePositionIgnoreObject(
             float distance,
             int layerMask,
             GameObject toIgnore
-        )
-        {
+        ) {
             Vector3 up = new Vector3(0.0f, 1.0f, 0.0f);
             RaycastHit[] hits = Physics.RaycastAll(position, up, distance, layerMask);
-            foreach (RaycastHit hit in hits)
-            {
-                if (hit.collider.transform.gameObject != toIgnore)
-                {
+            foreach (RaycastHit hit in hits) {
+                if (hit.collider.transform.gameObject != toIgnore) {
                     return true;
                 }
             }
             return false;
         }
 
-        private float[,,] initializeFlatSurfacesOnGrid(int yGridSize, int xGridSize)
-        {
+        private float[,,] initializeFlatSurfacesOnGrid(int yGridSize, int xGridSize) {
             float[,,] flatSurfacesOnGrid = new float[2, yGridSize, xGridSize];
-            for (int i = 0; i < 2; i++)
-            {
-                for (int j = 0; j < yGridSize; j++)
-                {
-                    for (int k = 0; k < xGridSize; k++)
-                    {
+            for (int i = 0; i < 2; i++) {
+                for (int j = 0; j < yGridSize; j++) {
+                    for (int k = 0; k < xGridSize; k++) {
                         flatSurfacesOnGrid[i, j, k] = float.PositiveInfinity;
                     }
                 }
@@ -6923,22 +5938,18 @@ GameObject toIgnore
             return flatSurfacesOnGrid;
         }
 
-        private void toggleColliders(IEnumerable<Collider> colliders)
-        {
-            foreach (Collider c in colliders)
-            {
+        private void toggleColliders(IEnumerable<Collider> colliders) {
+            foreach (Collider c in colliders) {
                 c.enabled = !c.enabled;
             }
         }
 
-        public void FlatSurfacesOnGrid(ServerAction action)
-        {
+        public void FlatSurfacesOnGrid(ServerAction action) {
             int xGridSize = (int)Math.Round(action.x, 0);
             int yGridSize = (int)Math.Round(action.y, 0);
             flatSurfacesOnGrid = initializeFlatSurfacesOnGrid(yGridSize, xGridSize);
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
 
@@ -6949,35 +5960,26 @@ public void FlatSurfacesOnGrid(ServerAction action)
                 "Procedural3",
                 "Procedural0"
             );
-            for (int i = 0; i < yGridSize; i++)
-            {
-                for (int j = 0; j < xGridSize; j++)
-                {
+            for (int i = 0; i < yGridSize; i++) {
+                for (int j = 0; j < xGridSize; j++) {
                     float x = j * (1.0f / xGridSize) + (0.5f / xGridSize);
                     float y = (1.0f - (0.5f / yGridSize)) - i * (1.0f / yGridSize);
                     Ray ray = m_Camera.ViewportPointToRay(new Vector3(x, y, 0));
                     RaycastHit[] hits = Physics.RaycastAll(ray, 10f, layerMask);
                     float minHitDistance = float.PositiveInfinity;
-                    foreach (RaycastHit hit in hits)
-                    {
-                        if (hit.distance < minHitDistance)
-                        {
+                    foreach (RaycastHit hit in hits) {
+                        if (hit.distance < minHitDistance) {
                             minHitDistance = hit.distance;
                         }
                     }
-                    foreach (RaycastHit hit in hits)
-                    {
+                    foreach (RaycastHit hit in hits) {
                         if (
                             NormalIsApproximatelyUp(hit.normal)
                             && !AnythingAbovePosition(hit.point, 0.1f)
-                        )
-                        {
-                            if (hit.distance == minHitDistance)
-                            {
+                        ) {
+                            if (hit.distance == minHitDistance) {
                                 flatSurfacesOnGrid[0, i, j] = minHitDistance;
-                            }
-                            else
-                            {
+                            } else {
                                 flatSurfacesOnGrid[1, i, j] = Math.Min(
                                     flatSurfacesOnGrid[1, i, j],
                                     hit.distance
@@ -6987,23 +5989,20 @@ public void FlatSurfacesOnGrid(ServerAction action)
                     }
                 }
             }
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
             actionFinished(true);
         }
 
-        public void GetMetadataOnGrid(ServerAction action)
-        {
+        public void GetMetadataOnGrid(ServerAction action) {
             int xGridSize = (int)Math.Round(action.x, 0);
             int yGridSize = (int)Math.Round(action.y, 0);
             distances = new float[yGridSize, xGridSize];
             normals = new float[3, yGridSize, xGridSize];
             isOpenableGrid = new bool[yGridSize, xGridSize];
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
 
@@ -7014,25 +6013,20 @@ public void GetMetadataOnGrid(ServerAction action)
                 "Procedural3",
                 "Procedural0"
             );
-            for (int i = 0; i < yGridSize; i++)
-            {
-                for (int j = 0; j < xGridSize; j++)
-                {
+            for (int i = 0; i < yGridSize; i++) {
+                for (int j = 0; j < xGridSize; j++) {
                     float x = j * (1.0f / xGridSize) + (0.5f / xGridSize);
                     float y = (1.0f - (0.5f / yGridSize)) - i * (1.0f / yGridSize);
                     Ray ray = m_Camera.ViewportPointToRay(new Vector3(x, y, 0));
                     RaycastHit hit;
-                    if (Physics.Raycast(ray, out hit, 10f, layerMask))
-                    {
+                    if (Physics.Raycast(ray, out hit, 10f, layerMask)) {
                         distances[i, j] = hit.distance;
                         normals[0, i, j] = Vector3.Dot(transform.right, hit.normal);
                         normals[1, i, j] = Vector3.Dot(transform.up, hit.normal);
                         normals[2, i, j] = Vector3.Dot(transform.forward, hit.normal);
                         SimObjPhysics so = hit.transform.gameObject.GetComponent<SimObjPhysics>();
                         isOpenableGrid[i, j] = so != null && (so.GetComponent<CanOpen_Object>());
-                    }
-                    else
-                    {
+                    } else {
                         distances[i, j] = float.PositiveInfinity;
                         normals[0, i, j] = float.NaN;
                         normals[1, i, j] = float.NaN;
@@ -7042,24 +6036,20 @@ public void GetMetadataOnGrid(ServerAction action)
                 }
             }
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
             actionFinished(true);
         }
 
-        public void SegmentVisibleObjects()
-        {
-            if (ItemInHand != null)
-            {
+        public void SegmentVisibleObjects() {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
 
             int k = 0;
             List<string> objectIds = new List<string>();
-            foreach (SimObjPhysics so in GetAllVisibleSimObjPhysics(m_Camera, 100f))
-            {
+            foreach (SimObjPhysics so in GetAllVisibleSimObjPhysics(m_Camera, 100f)) {
                 int i = (10 * k) / 256;
                 int j = (10 * k) % 256;
                 MaskSimObj(so, new Color32(Convert.ToByte(i), Convert.ToByte(j), 255, 255));
@@ -7068,8 +6058,7 @@ public void SegmentVisibleObjects()
             }
             segmentedObjectIds = objectIds.ToArray();
 
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 toggleColliders(ItemInHand.GetComponentsInChildren<Collider>());
             }
             actionFinished(true);
@@ -7078,8 +6067,7 @@ public void SegmentVisibleObjects()
         ////////////////////////////
         ///// Crouch and Stand /////
         ////////////////////////////
-        virtual public void crouch()
-        {
+        virtual public void crouch() {
             m_Camera.transform.localPosition = new Vector3(
                 standingLocalCameraPosition.x,
                 crouchingLocalCameraPosition.y,
@@ -7087,42 +6075,29 @@ virtual public void crouch()
             );
         }
 
-        public virtual void stand()
-        {
+        public virtual void stand() {
             m_Camera.transform.localPosition = standingLocalCameraPosition;
         }
 
-        public void Crouch()
-        {
-            if (!isStanding())
-            {
+        public void Crouch() {
+            if (!isStanding()) {
                 errorMessage = "Already crouching.";
                 actionFinished(false);
-            }
-            else if (!CheckIfItemBlocksAgentStandOrCrouch())
-            {
+            } else if (!CheckIfItemBlocksAgentStandOrCrouch()) {
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 crouch();
                 actionFinished(true);
             }
         }
 
-        public void Stand()
-        {
-            if (isStanding())
-            {
+        public void Stand() {
+            if (isStanding()) {
                 errorMessage = "Already standing.";
                 actionFinished(false);
-            }
-            else if (!CheckIfItemBlocksAgentStandOrCrouch())
-            {
+            } else if (!CheckIfItemBlocksAgentStandOrCrouch()) {
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 stand();
                 actionFinished(true);
             }
@@ -7132,23 +6107,17 @@ public void Stand()
         ///// MISC /////
         ////////////////
 
-        public void RotateUniverseAroundAgent(ServerAction action)
-        {
+        public void RotateUniverseAroundAgent(ServerAction action) {
             agentManager.RotateAgentsByRotatingUniverse(action.rotation.y);
             actionFinished(true);
         }
 
-        public void ChangeFOV(float fieldOfView, string camera = "")
-        {
-            if (fieldOfView > 0 && fieldOfView < 180)
-            {
-                if (string.IsNullOrEmpty(camera))
-                {
+        public void ChangeFOV(float fieldOfView, string camera = "") {
+            if (fieldOfView > 0 && fieldOfView < 180) {
+                if (string.IsNullOrEmpty(camera)) {
                     m_Camera.fieldOfView = fieldOfView;
                     actionFinished(true);
-                }
-                else
-                {
+                } else {
                     var cameraTuples = new List<(Camera camera, bool isThirdPartyCamera, int id)>()
                     {
                         (camera: m_Camera, isThirdPartyCamera: false, id: -1)
@@ -7158,39 +6127,29 @@ public void ChangeFOV(float fieldOfView, string camera = "")
                         )
                     );
                     var matches = cameraTuples;
-                    if (camera != "*")
-                    {
+                    if (camera != "*") {
                         matches = cameraTuples.Where(t => t.camera.name == camera);
                     }
                     // Debug.Log($"Camera matches: {matches.Count()} {string.Join(", ", matches.Select(m => m.camera.name))}");
-                    if (matches.Count() == 0)
-                    {
+                    if (matches.Count() == 0) {
                         errorMessage =
                             $"Camera '{camera}' is not present in the agent, make sure the agent was initialized correctly or camera was added via 'AddThirdPartyCamera'.";
                         actionFinished(false);
-                    }
-                    else
-                    {
-                        foreach (var tuple in matches)
-                        {
-                            if (tuple.isThirdPartyCamera)
-                            {
+                    } else {
+                        foreach (var tuple in matches) {
+                            if (tuple.isThirdPartyCamera) {
                                 agentManager.UpdateThirdPartyCamera(
                                     tuple.id,
                                     fieldOfView: fieldOfView
                                 );
-                            }
-                            else
-                            {
+                            } else {
                                 tuple.camera.fieldOfView = fieldOfView;
                             }
                         }
                         actionFinished(true);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "fov must be in (0, 180) noninclusive.";
                 Debug.Log(errorMessage);
                 actionFinished(false);
@@ -7198,15 +6157,11 @@ public void ChangeFOV(float fieldOfView, string camera = "")
         }
 
         // in case you want to change the timescale
-        public void ChangeTimeScale(ServerAction action)
-        {
-            if (action.timeScale > 0)
-            {
+        public void ChangeTimeScale(ServerAction action) {
+            if (action.timeScale > 0) {
                 Time.timeScale = action.timeScale;
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Time scale must be >0";
                 actionFinished(false);
             }
@@ -7219,14 +6174,11 @@ public void ChangeTimeScale(ServerAction action)
         // this is a combination of objectIsWithinViewport and objectIsCurrentlyVisible, specifically to check
         // if a single sim object is on screen regardless of agent visibility maxDistance
         // DO NOT USE THIS FOR ALL OBJECTS cause it's going to be soooo expensive
-        public bool objectIsOnScreen(SimObjPhysics sop)
-        {
+        public bool objectIsOnScreen(SimObjPhysics sop) {
             bool result = false;
-            if (sop.VisibilityPoints.Length > 0)
-            {
+            if (sop.VisibilityPoints.Length > 0) {
                 Transform[] visPoints = sop.VisibilityPoints;
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     Vector3 viewPoint = m_Camera.WorldToViewportPoint(point.position);
                     float ViewPointRangeHigh = 1.0f;
                     float ViewPointRangeLow = 0.0f;
@@ -7239,8 +6191,7 @@ public bool objectIsOnScreen(SimObjPhysics sop)
                         && // within x bounds of viewport
                         viewPoint.y < ViewPointRangeHigh
                         && viewPoint.y > ViewPointRangeLow // within y bounds of viewport
-                    )
-                    {
+                    ) {
                         // ok so it is within the viewport, not lets do a raycast to see if we can see the vis point
                         updateAllAgentCollidersForVisibilityCheck(false);
                         // raycast from agentcamera to point, ignore triggers, use layers 8 and 10
@@ -7261,14 +6212,10 @@ public bool objectIsOnScreen(SimObjPhysics sop)
                                     "Agent"
                                 )
                             )
-                        )
-                        {
-                            if (hit.transform != sop.transform)
-                            {
+                        ) {
+                            if (hit.transform != sop.transform) {
                                 result = false;
-                            }
-                            else
-                            {
+                            } else {
                                 result = true;
                                 break;
                             }
@@ -7278,29 +6225,23 @@ public bool objectIsOnScreen(SimObjPhysics sop)
 
                 updateAllAgentCollidersForVisibilityCheck(true);
                 return result;
-            }
-            else
-            {
+            } else {
                 Debug.Log("Error! Set at least 1 visibility point on SimObjPhysics prefab!");
             }
 
             return false;
         }
 
-        public bool objectIsCurrentlyVisible(SimObjPhysics sop, float maxDistance)
-        {
+        public bool objectIsCurrentlyVisible(SimObjPhysics sop, float maxDistance) {
             Debug.Log("trying to check if objectIsCurrentlyVisible");
-            if (sop.VisibilityPoints.Length > 0)
-            {
+            if (sop.VisibilityPoints.Length > 0) {
                 Transform[] visPoints = sop.VisibilityPoints;
                 updateAllAgentCollidersForVisibilityCheck(false);
-                foreach (Transform point in visPoints)
-                {
+                foreach (Transform point in visPoints) {
                     Vector3 tmp = point.position;
                     tmp.y = transform.position.y;
                     // Debug.Log(Vector3.Distance(tmp, transform.position));
-                    if (Vector3.Distance(tmp, transform.position) < maxDistance)
-                    {
+                    if (Vector3.Distance(tmp, transform.position) < maxDistance) {
                         // if this particular point is in view...
                         if (
                             (
@@ -7317,24 +6258,20 @@ public bool objectIsCurrentlyVisible(SimObjPhysics sop, float maxDistance)
                                     true
                                 ).visible
                             )
-                        )
-                        {
+                        ) {
                             updateAllAgentCollidersForVisibilityCheck(true);
                             return true;
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 Debug.Log("Error! Set at least 1 visibility point on SimObjPhysics prefab!");
             }
             updateAllAgentCollidersForVisibilityCheck(true);
             return false;
         }
 
-        protected int xzManhattanDistance(Vector3 p0, Vector3 p1, float gridSize)
-        {
+        protected int xzManhattanDistance(Vector3 p0, Vector3 p1, float gridSize) {
             return (
                 Math.Abs(Convert.ToInt32((p0.x - p1.x) / gridSize))
                 + Math.Abs(Convert.ToInt32((p0.z - p1.z) / gridSize))
@@ -7342,10 +6279,8 @@ protected int xzManhattanDistance(Vector3 p0, Vector3 p1, float gridSize)
         }
 
         // hide and seek action.
-        public void ExhaustiveSearchForItem(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void ExhaustiveSearchForItem(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Object ID appears to be invalid.";
                 actionFinished(false);
                 return;
@@ -7353,20 +6288,16 @@ public void ExhaustiveSearchForItem(ServerAction action)
             SimObjPhysics theObject = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
 
             Vector3[] positions = null;
-            if (action.positions != null && action.positions.Count != 0)
-            {
+            if (action.positions != null && action.positions.Count != 0) {
                 positions = action.positions.ToArray();
-            }
-            else
-            {
+            } else {
                 positions = getReachablePositions();
             }
 
             bool wasStanding = isStanding();
             Vector3 oldPosition = transform.position;
             Quaternion oldRotation = transform.rotation;
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.gameObject.SetActive(false);
             }
 
@@ -7375,8 +6306,7 @@ public void ExhaustiveSearchForItem(ServerAction action)
 
             SimplePriorityQueue<Vector3> pq = new SimplePriorityQueue<Vector3>();
             Vector3 agentPos = transform.position;
-            foreach (Vector3 p in positions)
-            {
+            foreach (Vector3 p in positions) {
                 pq.Enqueue(p, xzManhattanDistance(p, agentPos, gridSize));
             }
 
@@ -7385,46 +6315,35 @@ public void ExhaustiveSearchForItem(ServerAction action)
 #endif
             bool objectSeen = false;
             int positionsTried = 0;
-            while (pq.Count != 0 && !objectSeen)
-            {
+            while (pq.Count != 0 && !objectSeen) {
                 positionsTried += 1;
                 Vector3 p = pq.Dequeue();
                 transform.position = p;
                 Collider[] colliders = collidersWithinCapsuleCastOfAgent(maxVisibleDistance);
 
                 HashSet<SimObjPhysics> openableObjectsNearby = new HashSet<SimObjPhysics>();
-                foreach (Collider c in colliders)
-                {
+                foreach (Collider c in colliders) {
                     SimObjPhysics sop = ancestorSimObjPhysics(c.gameObject);
-                    if (sop != null && sop.GetComponent<CanOpen_Object>() != null)
-                    {
+                    if (sop != null && sop.GetComponent<CanOpen_Object>() != null) {
                         openableObjectsNearby.Add(sop);
                     }
                 }
 
-                foreach (SimObjPhysics openable in openableObjectsNearby)
-                {
-                    foreach (GameObject go in openable.GetComponent<CanOpen_Object>().MovingParts)
-                    {
+                foreach (SimObjPhysics openable in openableObjectsNearby) {
+                    foreach (GameObject go in openable.GetComponent<CanOpen_Object>().MovingParts) {
                         go.SetActive(false);
                     }
                 }
 
-                for (int j = 0; j < 2; j++)
-                { // Standing / Crouching
-                    if (j == 0)
-                    {
+                for (int j = 0; j < 2; j++) { // Standing / Crouching
+                    if (j == 0) {
                         stand();
-                    }
-                    else
-                    {
+                    } else {
                         crouch();
                     }
-                    for (int i = 0; i < 4; i++)
-                    { // 4 rotations
+                    for (int i = 0; i < 4; i++) { // 4 rotations
                         transform.rotation = Quaternion.Euler(new Vector3(0.0f, 90.0f * i, 0.0f));
-                        if (objectIsCurrentlyVisible(theObject, 1000f))
-                        {
+                        if (objectIsCurrentlyVisible(theObject, 1000f)) {
                             objectSeen = true;
 #if UNITY_EDITOR
                             visiblePosition = p;
@@ -7432,30 +6351,24 @@ public void ExhaustiveSearchForItem(ServerAction action)
                             break;
                         }
                     }
-                    if (objectSeen)
-                    {
+                    if (objectSeen) {
                         break;
                     }
                 }
 
-                foreach (SimObjPhysics openable in openableObjectsNearby)
-                {
-                    foreach (GameObject go in openable.GetComponent<CanOpen_Object>().MovingParts)
-                    {
+                foreach (SimObjPhysics openable in openableObjectsNearby) {
+                    foreach (GameObject go in openable.GetComponent<CanOpen_Object>().MovingParts) {
                         go.SetActive(true);
                     }
                 }
             }
 
 #if UNITY_EDITOR
-            if (objectSeen)
-            {
+            if (objectSeen) {
                 Debug.Log("Object found.");
                 Debug.Log("Manhattan distance:");
                 Debug.Log(xzManhattanDistance(visiblePosition, oldPosition, gridSize));
-            }
-            else
-            {
+            } else {
                 Debug.Log("Object not found.");
             }
             Debug.Log("BFS steps taken:");
@@ -7471,23 +6384,18 @@ public void ExhaustiveSearchForItem(ServerAction action)
             actionFinished(true, toReturn);
         }
 
-        protected HashSet<SimObjPhysics> getAllItemsVisibleFromPositions(Vector3[] positions)
-        {
+        protected HashSet<SimObjPhysics> getAllItemsVisibleFromPositions(Vector3[] positions) {
             bool wasStanding = isStanding();
             Vector3 oldPosition = transform.position;
             Quaternion oldRotation = transform.rotation;
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.gameObject.SetActive(false);
             }
 
             List<GameObject> movingPartsDisabled = new List<GameObject>();
-            foreach (SimObjPhysics sop in physicsSceneManager.ObjectIdToSimObjPhysics.Values)
-            {
-                if (sop.GetComponent<CanOpen_Object>() != null)
-                {
-                    foreach (GameObject go in sop.GetComponent<CanOpen_Object>().MovingParts)
-                    {
+            foreach (SimObjPhysics sop in physicsSceneManager.ObjectIdToSimObjPhysics.Values) {
+                if (sop.GetComponent<CanOpen_Object>() != null) {
+                    foreach (GameObject go in sop.GetComponent<CanOpen_Object>().MovingParts) {
                         movingPartsDisabled.Add(go);
                         go.SetActive(false);
                     }
@@ -7496,20 +6404,14 @@ protected HashSet<SimObjPhysics> getAllItemsVisibleFromPositions(Vector3[] posit
 
             HashSet<SimObjPhysics> allVisible = new HashSet<SimObjPhysics>();
             float[] rotations = { 0f, 90f, 180f, 270f };
-            foreach (Vector3 p in positions)
-            {
+            foreach (Vector3 p in positions) {
                 transform.position = p;
-                foreach (float rotation in rotations)
-                {
+                foreach (float rotation in rotations) {
                     transform.rotation = Quaternion.Euler(new Vector3(0f, rotation, 0f));
-                    for (int i = 0; i < 2; i++)
-                    {
-                        if (i == 0)
-                        {
+                    for (int i = 0; i < 2; i++) {
+                        if (i == 0) {
                             stand();
-                        }
-                        else
-                        {
+                        } else {
                             crouch();
                         }
                         foreach (
@@ -7517,31 +6419,25 @@ SimObjPhysics sop in GetAllVisibleSimObjPhysics(
                                 m_Camera,
                                 1.0f + maxVisibleDistance
                             )
-                        )
-                        {
+                        ) {
                             allVisible.Add(sop);
                         }
                     }
                 }
             }
 
-            foreach (GameObject go in movingPartsDisabled)
-            {
+            foreach (GameObject go in movingPartsDisabled) {
                 go.SetActive(true);
             }
 
-            if (wasStanding)
-            {
+            if (wasStanding) {
                 stand();
-            }
-            else
-            {
+            } else {
                 crouch();
             }
             transform.position = oldPosition;
             transform.rotation = oldRotation;
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.gameObject.SetActive(true);
             }
 
@@ -7553,33 +6449,25 @@ public void SetTransform(
             Transform transform,
             Vector3? position = null,
             Quaternion? rotation = null
-        )
-        {
-            if (!transform.GetComponent<ArticulationBody>())
-            {
-                if (position != null)
-                {
+        ) {
+            if (!transform.GetComponent<ArticulationBody>()) {
+                if (position != null) {
                     transform.position = (Vector3)position;
                 }
 
-                if (rotation != null)
-                {
+                if (rotation != null) {
                     transform.rotation = (Quaternion)rotation;
                 }
             }
             //handle if this transform we are trying to manipulate is an articulation body and needs to be treated special
-            else
-            {
+            else {
                 Debug.Log("SetTransform with Articulation Body happening!");
                 ArticulationBody articulationBody = transform.GetComponent<ArticulationBody>();
 
-                if (position != null && rotation != null)
-                {
+                if (position != null && rotation != null) {
                     Debug.Log("Teleporting position and rotation");
                     articulationBody.TeleportRoot((Vector3)position, (Quaternion)rotation);
-                }
-                else if (position != null && rotation == null)
-                {
+                } else if (position != null && rotation == null) {
                     Debug.Log("Teleporting position, default rotation");
                     Debug.Log(
                         $"Passing to TeleportRoot(): position is {position}, but casting it is {(Vector3)position}"
@@ -7588,9 +6476,7 @@ public void SetTransform(
                         (Vector3)position,
                         articulationBody.transform.rotation
                     );
-                }
-                else if (position == null && rotation != null)
-                {
+                } else if (position == null && rotation != null) {
                     Debug.Log("Teleporting rotation, default position");
                     articulationBody.TeleportRoot(
                         articulationBody.transform.position,
@@ -7611,37 +6497,29 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
             bool[] standings = null,
             float? maxDistance = null,
             int maxPoses = int.MaxValue // works like infinity
-        )
-        {
+        ) {
             Debug.Log(
                 $"Position of agent at start of GetInteractablePoses: {this.transform.position}"
             );
-            if (360 % rotateStepDegrees != 0 && rotations != null)
-            {
+            if (360 % rotateStepDegrees != 0 && rotations != null) {
                 throw new InvalidOperationException(
                     $"360 % rotateStepDegrees (360 % {rotateStepDegrees} != 0) must be 0, unless 'rotations: float[]' is overwritten."
                 );
             }
 
-            if (maxPoses <= 0)
-            {
+            if (maxPoses <= 0) {
                 throw new ArgumentOutOfRangeException("maxPoses must be > 0.");
             }
 
             // default "visibility" distance
             float maxDistanceFloat;
-            if (maxDistance == null)
-            {
+            if (maxDistance == null) {
                 maxDistanceFloat = maxVisibleDistance;
-            }
-            else if ((float)maxDistance <= 0)
-            {
+            } else if ((float)maxDistance <= 0) {
                 throw new ArgumentOutOfRangeException(
                     "maxDistance must be >= 0 meters from the object."
                 );
-            }
-            else
-            {
+            } else {
                 maxDistanceFloat = (float)maxDistance;
             }
 
@@ -7652,23 +6530,17 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
 
             // Populate default standings. Note that these are boolean because that's
             // the most natural integration with Teleport
-            if (standings == null)
-            {
+            if (standings == null) {
                 standings = new bool[] { false, true };
             }
 
             // populate default horizons
-            if (horizons == null)
-            {
+            if (horizons == null) {
                 horizons = new float[] { -30, 0, 30, 60 };
-            }
-            else
-            {
-                foreach (float horizon in horizons)
-                {
+            } else {
+                foreach (float horizon in horizons) {
                     // recall that horizon=60 is look down 60 degrees and horizon=-30 is look up 30 degrees
-                    if (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle)
-                    {
+                    if (horizon > maxDownwardLookAngle || horizon < -maxUpwardLookAngle) {
                         throw new ArgumentException(
                             $"Each horizon must be in [{-maxUpwardLookAngle}:{maxDownwardLookAngle}]. You gave {horizon}."
                         );
@@ -7677,14 +6549,12 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
             }
 
             // populate the positions by those that are reachable
-            if (positions == null)
-            {
+            if (positions == null) {
                 positions = getReachablePositions();
             }
 
             // populate the rotations based on rotateStepDegrees
-            if (rotations == null)
-            {
+            if (rotations == null) {
                 // Consider the case where one does not want to move on a perfect grid, and is currently moving
                 // with an offsetted set of rotations like {10, 100, 190, 280} instead of the default {0, 90, 180, 270}.
                 // This may happen if the agent starts by teleports with the rotation of 10 degrees.
@@ -7699,8 +6569,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
                     float rotation = offset;
                     rotation < 360 + offset;
                     rotation += rotateStepDegrees
-                )
-                {
+                ) {
                     rotations[i++] = rotation;
                 }
             }
@@ -7710,8 +6579,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
                 || rotations.Length == 0
                 || positions.Length == 0
                 || standings.Length == 0
-            )
-            {
+            ) {
                 throw new InvalidOperationException(
                     "Every degree of freedom must have at least 1 valid value."
                 );
@@ -7722,8 +6590,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
             Vector3 oldPosition = transform.position;
             Quaternion oldRotation = transform.rotation;
             Vector3 oldHorizon = m_Camera.transform.localEulerAngles;
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.gameObject.SetActive(false);
             }
 
@@ -7732,8 +6599,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
             // which is then used to filter the set of all reachable positions to just those plausible positions.
             Bounds objectBounds = UtilityFunctions.CreateEmptyBounds();
             objectBounds.Encapsulate(theObject.transform.position);
-            foreach (Transform vp in theObject.VisibilityPoints)
-            {
+            foreach (Transform vp in theObject.VisibilityPoints) {
                 objectBounds.Encapsulate(vp.position);
             }
             float fudgeFactor = objectBounds.extents.magnitude;
@@ -7755,23 +6621,17 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
 
             // iterate over each reasonable agent pose
             bool stopEarly = false;
-            foreach (float horizon in horizons)
-            {
+            foreach (float horizon in horizons) {
                 m_Camera.transform.localEulerAngles = new Vector3(horizon, 0f, 0f);
                 Debug.Log($"setting horizon to: {m_Camera.transform.localEulerAngles.x}");
-                foreach (bool standing in standings)
-                {
-                    if (standing)
-                    {
+                foreach (bool standing in standings) {
+                    if (standing) {
                         stand();
-                    }
-                    else
-                    {
+                    } else {
                         crouch();
                     }
 
-                    foreach (float rotation in rotations)
-                    {
+                    foreach (float rotation in rotations) {
                         Vector3 rotationVector = new Vector3(x: 0, y: rotation, z: 0);
                         //Debug.Log($"initial rotation: {transform.rotation}");
                         SetTransform(
@@ -7780,8 +6640,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
                         );
                         //Debug.Log($"Rotation after SetTransform(): {transform.rotation}");
 
-                        foreach (Vector3 position in filteredPositions)
-                        {
+                        foreach (Vector3 position in filteredPositions) {
                             Debug.Log("////////////////////");
                             Debug.Log($"position Before SetTransform: {transform.position}");
                             Debug.Log(
@@ -7793,11 +6652,9 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
 
                             // Each of these values is directly compatible with TeleportFull
                             // and should be used with .step(action='TeleportFull', **interactable_positions[0])
-                            if (objectIsCurrentlyVisible(theObject, maxDistanceFloat))
-                            {
+                            if (objectIsCurrentlyVisible(theObject, maxDistanceFloat)) {
                                 validAgentPoses.Add(
-                                    new Dictionary<string, object>
-                                    {
+                                    new Dictionary<string, object> {
                                         ["x"] = position.x,
                                         ["y"] = position.y,
                                         ["z"] = position.z,
@@ -7807,8 +6664,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
                                     }
                                 );
 
-                                if (validAgentPoses.Count >= maxPoses)
-                                {
+                                if (validAgentPoses.Count >= maxPoses) {
                                     stopEarly = true;
                                     break;
                                 }
@@ -7824,29 +6680,23 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
 #endif
                             }
                         }
-                        if (stopEarly)
-                        {
+                        if (stopEarly) {
                             break;
                         }
                     }
-                    if (stopEarly)
-                    {
+                    if (stopEarly) {
                         break;
                     }
                 }
-                if (stopEarly)
-                {
+                if (stopEarly) {
                     break;
                 }
             }
 
             // restore old agent pose
-            if (wasStanding)
-            {
+            if (wasStanding) {
                 stand();
-            }
-            else
-            {
+            } else {
                 crouch();
             }
             SetTransform(
@@ -7855,8 +6705,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
                 rotation: (Quaternion?)oldRotation
             );
             m_Camera.transform.localEulerAngles = oldHorizon;
-            if (ItemInHand != null)
-            {
+            if (ItemInHand != null) {
                 ItemInHand.gameObject.SetActive(true);
             }
 
@@ -7865,8 +6714,7 @@ public virtual List<Dictionary<string, object>> getInteractablePoses(
             Debug.Log(validAgentPoses);
 #endif
 
-            if (markActionFinished)
-            {
+            if (markActionFinished) {
                 actionFinishedEmit(success: true, actionReturn: validAgentPoses);
             }
 
@@ -7883,8 +6731,7 @@ public virtual void GetInteractablePoses(
             bool[] standings = null,
             float? maxDistance = null,
             int maxPoses = int.MaxValue // works like infinity
-        )
-        {
+        ) {
             getInteractablePoses(
                 objectId: objectId,
                 markActionFinished: true,
@@ -7905,12 +6752,10 @@ public void PositionsFromWhichItemIsInteractable(
             string objectId,
             float horizon = 30,
             Vector3[] positions = null
-        )
-        {
+        ) {
             // set horizons using the horizon as an increment
             List<float> horizons = new List<float>();
-            for (float h = -maxUpwardLookAngle; h <= maxDownwardLookAngle; h += horizon)
-            {
+            for (float h = -maxUpwardLookAngle; h <= maxDownwardLookAngle; h += horizon) {
                 horizons.Add(h);
             }
             List<Dictionary<string, object>> interactablePoses = getInteractablePoses(
@@ -7925,21 +6770,15 @@ public void PositionsFromWhichItemIsInteractable(
             // where the latter is cleaner in python.
             Dictionary<string, List<float>> d = new Dictionary<string, List<float>>();
             string[] keys = { "x", "y", "z", "rotation", "standing", "horizon" };
-            foreach (string key in keys)
-            {
+            foreach (string key in keys) {
                 d[key] = new List<float>();
             }
-            foreach (Dictionary<string, object> pose in interactablePoses)
-            {
-                foreach (string key in keys)
-                {
-                    if (key == "standing")
-                    {
+            foreach (Dictionary<string, object> pose in interactablePoses) {
+                foreach (string key in keys) {
+                    if (key == "standing") {
                         // standing is converted from true => 1 to false => 0, for backwards compatibility
                         d[key].Add((bool)pose[key] ? 1 : 0);
-                    }
-                    else
-                    {
+                    } else {
                         // all other keys have float outputs
                         d[key].Add((float)pose[key]);
                     }
@@ -7954,8 +6793,7 @@ private int numVisiblePositions(
             bool markActionFinished,
             Vector3[] positions = null,
             int maxPoses = int.MaxValue
-        )
-        {
+        ) {
             List<Dictionary<string, object>> interactablePoses = getInteractablePoses(
                 objectId: objectId,
                 positions: positions,
@@ -7966,8 +6804,7 @@ private int numVisiblePositions(
             );
 
             // object id might have been invalid, causing failure
-            if (markActionFinished)
-            {
+            if (markActionFinished) {
                 actionFinishedEmit(success: true, actionReturn: interactablePoses.Count);
             }
             return interactablePoses.Count;
@@ -7977,44 +6814,36 @@ private int numVisiblePositions(
         public void NumberOfPositionsFromWhichItemIsVisible(
             string objectId,
             Vector3[] positions = null
-        )
-        {
+        ) {
             numVisiblePositions(objectId: objectId, positions: positions, markActionFinished: true);
         }
 
-        public void TogglePhysics()
-        {
+        public void TogglePhysics() {
             Physics.autoSimulation = !Physics.autoSimulation;
             actionFinished(true);
         }
 
-        public void ChangeOpenSpeed(ServerAction action)
-        {
-            foreach (CanOpen_Object coo in GameObject.FindObjectsOfType<CanOpen_Object>())
-            {
+        public void ChangeOpenSpeed(ServerAction action) {
+            foreach (CanOpen_Object coo in GameObject.FindObjectsOfType<CanOpen_Object>()) {
                 coo.animationTime = action.x;
             }
             actionFinished(true);
         }
 
         // to ignore the agent in this collision check, set ignoreAgent to true
-        protected bool isHandObjectColliding(bool ignoreAgent = false, float expandBy = 0.0f)
-        {
-            if (ItemInHand == null)
-            {
+        protected bool isHandObjectColliding(bool ignoreAgent = false, float expandBy = 0.0f) {
+            if (ItemInHand == null) {
                 return false;
             }
             List<GameObject> ignoreGameObjects = new List<GameObject>();
             // Ignore the agent when determining if the hand object is colliding
-            if (ignoreAgent)
-            {
+            if (ignoreAgent) {
                 ignoreGameObjects.Add(this.gameObject);
             }
             return UtilityFunctions.isObjectColliding(ItemInHand, ignoreGameObjects, expandBy);
         }
 
-        protected bool isAgentCapsuleCollidingWith(GameObject otherGameObject)
-        {
+        protected bool isAgentCapsuleCollidingWith(GameObject otherGameObject) {
             int layerMask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -8028,10 +6857,8 @@ Collider c in PhysicsExtensions.OverlapCapsule(
                     layerMask,
                     QueryTriggerInteraction.Ignore
                 )
-            )
-            {
-                if (hasAncestor(c.transform.gameObject, otherGameObject))
-                {
+            ) {
+                if (hasAncestor(c.transform.gameObject, otherGameObject)) {
                     return true;
                 }
             }
@@ -8127,25 +6954,19 @@ Collider c in PhysicsExtensions.OverlapCapsule(
         //     return false;
         // }
 
-        public float roundToGridSize(float x, float gridSize, bool roundUp)
-        {
+        public float roundToGridSize(float x, float gridSize, bool roundUp) {
             int mFactor = Convert.ToInt32(1.0f / gridSize);
-            if (Math.Abs(mFactor - 1.0f / gridSize) > 1e-3)
-            {
+            if (Math.Abs(mFactor - 1.0f / gridSize) > 1e-3) {
                 throw new Exception("1.0 / gridSize should be an integer.");
             }
-            if (roundUp)
-            {
+            if (roundUp) {
                 return (float)Math.Ceiling(mFactor * x) / mFactor;
-            }
-            else
-            {
+            } else {
                 return (float)Math.Floor(mFactor * x) / mFactor;
             }
         }
 
-        public void RandomlyMoveAgent(int randomSeed = 0)
-        {
+        public void RandomlyMoveAgent(int randomSeed = 0) {
 #if UNITY_EDITOR
             randomSeed = UnityEngine.Random.Range(0, 1000000);
 #endif
@@ -8155,12 +6976,9 @@ public void RandomlyMoveAgent(int randomSeed = 0)
             reachablePositions.Shuffle_(randomSeed);
 
             bool success = false;
-            foreach (Vector3 position in reachablePositions)
-            {
-                foreach (float rotation in orientations)
-                {
-                    if (handObjectCanFitInPosition(position, rotation))
-                    {
+            foreach (Vector3 position in reachablePositions) {
+                foreach (float rotation in orientations) {
+                    if (handObjectCanFitInPosition(position, rotation)) {
                         this.transform.position = position;
                         this.transform.rotation = Quaternion.Euler(0.0f, rotation, 0.0f);
                         success = true;
@@ -8169,25 +6987,18 @@ public void RandomlyMoveAgent(int randomSeed = 0)
                 }
             }
 
-            if (errorMessage != "")
-            {
+            if (errorMessage != "") {
                 actionFinished(false);
-            }
-            else if (!success)
-            {
+            } else if (!success) {
                 errorMessage = "Could not find a position in which the agent and object fit.";
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 actionFinished(true, reachablePositions);
             }
         }
 
-        public void GetReachablePositionsForObject(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void GetReachablePositionsForObject(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Object " + action.objectId + " does not seem to exist.";
                 actionFinished(false);
                 return;
@@ -8198,18 +7009,14 @@ public void GetReachablePositionsForObject(ServerAction action)
             Quaternion startRot = sop.transform.rotation;
 
             Vector3[] positions = null;
-            if (action.positions != null && action.positions.Count != 0)
-            {
+            if (action.positions != null && action.positions.Count != 0) {
                 positions = action.positions.ToArray();
-            }
-            else
-            {
+            } else {
                 positions = getReachablePositions();
             }
 
             Bounds b = UtilityFunctions.CreateEmptyBounds();
-            foreach (Vector3 p in positions)
-            {
+            foreach (Vector3 p in positions) {
                 b.Encapsulate(p);
             }
 
@@ -8223,17 +7030,14 @@ public void GetReachablePositionsForObject(ServerAction action)
             // Debug.Log(zMax);
 
             List<GameObject> agentGameObjects = new List<GameObject>();
-            foreach (BaseFPSAgentController agent in agentManager.agents)
-            {
+            foreach (BaseFPSAgentController agent in agentManager.agents) {
                 agentGameObjects.Add(agent.gameObject);
             }
             // List<Vector3> reachable = new List<Vector3>();
 
             List<Collider> enabledColliders = new List<Collider>();
-            foreach (Collider c in sop.GetComponentsInChildren<Collider>())
-            {
-                if (c.enabled)
-                {
+            foreach (Collider c in sop.GetComponentsInChildren<Collider>()) {
+                if (c.enabled) {
                     c.enabled = false;
                     enabledColliders.Add(c);
                 }
@@ -8242,15 +7046,12 @@ public void GetReachablePositionsForObject(ServerAction action)
 
             Dictionary<int, List<Vector3>> reachablePerRotation =
                 new Dictionary<int, List<Vector3>>();
-            for (int k = 0; k < 4; k++)
-            {
+            for (int k = 0; k < 4; k++) {
                 reachablePerRotation[90 * k] = new List<Vector3>();
                 sop.transform.rotation = Quaternion.Euler(new Vector3(0f, k * 90f, 0f));
 
-                for (int i = 0; i <= (int)((xMax - xMin) / gridSize); i++)
-                {
-                    for (int j = 0; j <= (int)((zMax - zMin) / gridSize); j++)
-                    {
+                for (int i = 0; i <= (int)((xMax - xMin) / gridSize); i++) {
+                    for (int j = 0; j <= (int)((zMax - zMin) / gridSize); j++) {
                         Vector3 p = new Vector3(
                             xMin + gridSize * i,
                             startPos.y,
@@ -8264,8 +7065,7 @@ public void GetReachablePositionsForObject(ServerAction action)
                                 0.0f,
                                 true
                             )
-                        )
-                        {
+                        ) {
                             // #if UNITY_EDITOR
                             // Debug.Log(p);
                             // #endif
@@ -8283,8 +7083,7 @@ public void GetReachablePositionsForObject(ServerAction action)
                 }
             }
             sop.BoundingBox.GetComponent<BoxCollider>().enabled = false;
-            foreach (Collider c in enabledColliders)
-            {
+            foreach (Collider c in enabledColliders) {
                 c.enabled = true;
             }
 
@@ -8300,33 +7099,24 @@ public void GetReachablePositionsForObject(ServerAction action)
             actionFinished(true, reachablePerRotation);
         }
 
-        private bool stringInSomeAncestorName(GameObject go, string[] strs)
-        {
-            foreach (string str in strs)
-            {
-                if (go.name.Contains(str))
-                {
+        private bool stringInSomeAncestorName(GameObject go, string[] strs) {
+            foreach (string str in strs) {
+                if (go.name.Contains(str)) {
                     return true;
                 }
             }
-            if (go.transform.parent != null)
-            {
+            if (go.transform.parent != null) {
                 return stringInSomeAncestorName(go.transform.parent.gameObject, strs);
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
 
-        public void HideObscuringObjects(ServerAction action)
-        {
+        public void HideObscuringObjects(ServerAction action) {
             string objType = "";
-            if (action.objectId != null && action.objectId != "")
-            {
+            if (action.objectId != null && action.objectId != "") {
                 string[] split = action.objectId.Split('|');
-                if (split.Length != 0)
-                {
+                if (split.Length != 0) {
                     objType = action.objectId.Split('|')[0];
                 }
             }
@@ -8339,18 +7129,14 @@ public void HideObscuringObjects(ServerAction action)
                 "Procedural3",
                 "Procedural0"
             );
-            for (int i = 0; i < yGridSize; i++)
-            {
-                for (int j = 0; j < xGridSize; j++)
-                {
+            for (int i = 0; i < yGridSize; i++) {
+                for (int j = 0; j < xGridSize; j++) {
                     float x = j * (1.0f / xGridSize) + (0.5f / xGridSize);
                     float y = (1.0f - (0.5f / yGridSize)) - i * (1.0f / yGridSize);
                     Ray ray = m_Camera.ViewportPointToRay(new Vector3(x, y, 0));
                     RaycastHit hit;
-                    while (true)
-                    {
-                        if (Physics.Raycast(ray, out hit, 10f, layerMask))
-                        {
+                    while (true) {
+                        if (Physics.Raycast(ray, out hit, 10f, layerMask)) {
                             UpdateDisplayGameObject(hit.transform.gameObject, false);
                             SimObjPhysics hitObj =
                                 hit.transform.gameObject.GetComponentInChildren<SimObjPhysics>();
@@ -8358,17 +7144,12 @@ public void HideObscuringObjects(ServerAction action)
                                 hitObj != null
                                 && objType != ""
                                 && hitObj.ObjectID.Contains(objType)
-                            )
-                            {
+                            ) {
                                 ray.origin = hit.point + ray.direction / 100f;
-                            }
-                            else
-                            {
+                            } else {
                                 break;
                             }
-                        }
-                        else
-                        {
+                        } else {
                             break;
                         }
                     }
@@ -8378,18 +7159,15 @@ public void HideObscuringObjects(ServerAction action)
         }
 
         // spawns object in agent's hand with the same orientation as the agent's hand
-        public void CreateObject(ServerAction action)
-        {
-            if (ItemInHand != null)
-            {
+        public void CreateObject(ServerAction action) {
+            if (ItemInHand != null) {
                 errorMessage =
                     "Already have an object in hand, can't create a new one to put there.";
                 actionFinished(false);
                 return;
             }
 
-            if (action.objectType == null)
-            {
+            if (action.objectType == null) {
                 errorMessage = "Please give valid Object Type from SimObjType enum list";
                 actionFinished(false);
                 return;
@@ -8408,8 +7186,7 @@ public void CreateObject(ServerAction action)
                 action.forceAction
             );
 
-            if (so == null)
-            {
+            if (so == null) {
                 throw new InvalidOperationException(
                     "Failed to create object, are you sure it can be spawned?"
                 );
@@ -8421,20 +7198,17 @@ public void CreateObject(ServerAction action)
             PickupObject(objectId: so.objectID, forceAction: true);
         }
 
-        public void CreateObjectAtLocation(ServerAction action)
-        {
+        public void CreateObjectAtLocation(ServerAction action) {
             Vector3 targetPosition = action.position;
             Vector3 targetRotation = action.rotation;
 
-            if (!action.forceAction && !agentManager.SceneBounds.Contains(targetPosition))
-            {
+            if (!action.forceAction && !agentManager.SceneBounds.Contains(targetPosition)) {
                 errorMessage = "Target position is out of bounds!";
                 actionFinished(false);
                 return;
             }
 
-            if (action.objectType == null)
-            {
+            if (action.objectType == null) {
                 errorMessage = "Please give valid Object Type from SimObjType enum list";
                 actionFinished(false);
                 return;
@@ -8453,14 +7227,11 @@ public void CreateObjectAtLocation(ServerAction action)
                 action.forceAction
             );
 
-            if (so == null)
-            {
+            if (so == null) {
                 errorMessage = "Failed to create object, are you sure it can be spawned?";
                 actionFinished(false);
                 return;
-            }
-            else
-            {
+            } else {
                 // also update the PHysics Scene Manager with this new object
                 physicsSceneManager.AddToObjectsInScene(so);
             }
@@ -8473,16 +7244,13 @@ protected SimObjPhysics createObjectAtLocation(
             Vector3 targetPosition,
             Vector3 targetRotation,
             int objectVariation = 1
-        )
-        {
-            if (!agentManager.SceneBounds.Contains(targetPosition))
-            {
+        ) {
+            if (!agentManager.SceneBounds.Contains(targetPosition)) {
                 errorMessage = "Target position is out of bounds!";
                 return null;
             }
 
-            if (objectType == null)
-            {
+            if (objectType == null) {
                 errorMessage = "Please give valid Object Type from SimObjType enum list";
                 return null;
             }
@@ -8499,13 +7267,10 @@ protected SimObjPhysics createObjectAtLocation(
                 false
             );
 
-            if (so == null)
-            {
+            if (so == null) {
                 errorMessage = "Failed to create object, are you sure it can be spawned?";
                 return null;
-            }
-            else
-            {
+            } else {
                 // also update the PHysics Scene Manager with this new object
                 physicsSceneManager.AddToObjectsInScene(so);
             }
@@ -8513,35 +7278,28 @@ protected SimObjPhysics createObjectAtLocation(
             return so;
         }
 
-        public void CreateObjectOnFloor(ServerAction action)
-        {
+        public void CreateObjectOnFloor(ServerAction action) {
             InstantiatePrefabTest script =
                 physicsSceneManager.GetComponent<InstantiatePrefabTest>();
             Bounds b = script.BoundsOfObject(action.objectType, 1);
-            if (b.min.x == float.PositiveInfinity)
-            {
+            if (b.min.x == float.PositiveInfinity) {
                 errorMessage = "Could not get bounds for the object to be created on the floor";
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 action.y = b.extents.y + getFloorY(action.x, action.z) + 0.1f;
                 action.position = new Vector3(action.x, action.y, action.z);
                 CreateObjectAtLocation(action);
             }
         }
 
-        protected bool randomlyPlaceObjectOnFloor(SimObjPhysics sop, Vector3[] candidatePositions)
-        {
+        protected bool randomlyPlaceObjectOnFloor(SimObjPhysics sop, Vector3[] candidatePositions) {
             var oldPosition = sop.transform.position;
             var oldRotation = sop.transform.rotation;
 
             sop.transform.rotation = Quaternion.identity;
             Bounds b = UtilityFunctions.CreateEmptyBounds();
-            foreach (Renderer r in sop.GetComponentsInChildren<Renderer>())
-            {
-                if (r.enabled)
-                {
+            foreach (Renderer r in sop.GetComponentsInChildren<Renderer>()) {
+                if (r.enabled) {
                     b.Encapsulate(r.bounds);
                 }
             }
@@ -8551,26 +7309,21 @@ protected bool randomlyPlaceObjectOnFloor(SimObjPhysics sop, Vector3[] candidate
             float[] rotations = { 0f, 90f, 180f, 270f };
             List<float> shuffledRotations = (List<float>)rotations.ToList().Shuffle_();
             bool objectColliding = true;
-            foreach (Vector3 position in shuffledCurrentlyReachable)
-            {
+            foreach (Vector3 position in shuffledCurrentlyReachable) {
                 float y = b.extents.y + getFloorY(position.x, position.y, position.z) + 0.1f;
-                foreach (float r in shuffledRotations)
-                {
+                foreach (float r in shuffledRotations) {
                     sop.transform.position = new Vector3(position.x, y, position.z);
                     sop.transform.rotation = Quaternion.Euler(new Vector3(0.0f, r, 0.0f));
                     objectColliding = UtilityFunctions.isObjectColliding(sop.gameObject);
-                    if (!objectColliding)
-                    {
+                    if (!objectColliding) {
                         break;
                     }
                 }
-                if (!objectColliding)
-                {
+                if (!objectColliding) {
                     break;
                 }
             }
-            if (objectColliding)
-            {
+            if (objectColliding) {
                 sop.transform.position = oldPosition;
                 sop.transform.rotation = oldRotation;
             }
@@ -8581,13 +7334,11 @@ protected SimObjPhysics randomlyCreateAndPlaceObjectOnFloor(
             string objectType,
             int objectVariation,
             Vector3[] candidatePositions
-        )
-        {
+        ) {
             InstantiatePrefabTest script =
                 physicsSceneManager.GetComponent<InstantiatePrefabTest>();
             Bounds b = script.BoundsOfObject(objectType, 1);
-            if (b.min.x != float.PositiveInfinity)
-            {
+            if (b.min.x != float.PositiveInfinity) {
                 errorMessage = "Could not get bounds of object with type " + objectType;
             }
 
@@ -8597,24 +7348,20 @@ Vector3[] candidatePositions
             float[] rotations = { 0f, 90f, 180f, 270f };
             float[] shuffledRotations = rotations.OrderBy(x => systemRandom.Next()).ToArray();
             SimObjPhysics objectCreated = null;
-            foreach (Vector3 position in shuffledCurrentlyReachable)
-            {
+            foreach (Vector3 position in shuffledCurrentlyReachable) {
                 float y = b.extents.y + getFloorY(position.x, position.y, position.z) + 0.01f;
-                foreach (float r in shuffledRotations)
-                {
+                foreach (float r in shuffledRotations) {
                     objectCreated = createObjectAtLocation(
                         objectType,
                         new Vector3(position.x, y, position.z),
                         new Vector3(0.0f, r, 0.0f),
                         objectVariation
                     );
-                    if (objectCreated)
-                    {
+                    if (objectCreated) {
                         break;
                     }
                 }
-                if (objectCreated)
-                {
+                if (objectCreated) {
                     errorMessage = "";
                     break;
                 }
@@ -8625,8 +7372,7 @@ Vector3[] candidatePositions
         protected SimObjPhysics randomlyCreateAndPlaceObjectOnFloor(
             string objectType,
             int objectVariation
-        )
-        {
+        ) {
             return randomlyCreateAndPlaceObjectOnFloor(
                 objectType,
                 objectVariation,
@@ -8634,28 +7380,22 @@ int objectVariation
             );
         }
 
-        public void RandomlyCreateAndPlaceObjectOnFloor(string objectType, int objectVariation = 0)
-        {
+        public void RandomlyCreateAndPlaceObjectOnFloor(string objectType, int objectVariation = 0) {
             SimObjPhysics objectCreated = randomlyCreateAndPlaceObjectOnFloor(
                 objectType,
                 objectVariation
             );
-            if (!objectCreated)
-            {
+            if (!objectCreated) {
                 errorMessage = "Failed to randomly create object. " + errorMessage;
                 actionFinished(false);
-            }
-            else
-            {
+            } else {
                 errorMessage = "";
                 actionFinished(true, objectCreated.ObjectID);
             }
         }
 
-        public void GetPositionsObjectVisibleFrom(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void GetPositionsObjectVisibleFrom(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Object " + action.objectId + " does not seem to exist.";
                 actionFinished(false);
                 return;
@@ -8671,27 +7411,20 @@ public void GetPositionsObjectVisibleFrom(ServerAction action)
             List<float> goodRotations = new List<float>();
 
             Vector3[] positions = null;
-            if (action.positions != null && action.positions.Count != 0)
-            {
+            if (action.positions != null && action.positions.Count != 0) {
                 positions = action.positions.ToArray();
-            }
-            else
-            {
+            } else {
                 positions = getReachablePositions();
             }
 
-            foreach (Vector3 position in positions)
-            {
+            foreach (Vector3 position in positions) {
                 Vector3 tmp = position;
                 tmp.y = sop.transform.position.y;
-                if (Vector3.Distance(tmp, sop.transform.position) <= 2 * maxVisibleDistance)
-                {
-                    foreach (float r in rotations)
-                    {
+                if (Vector3.Distance(tmp, sop.transform.position) <= 2 * maxVisibleDistance) {
+                    foreach (float r in rotations) {
                         transform.position = position;
                         transform.rotation = Quaternion.Euler(new Vector3(0f, r, 0f));
-                        if (objectIsCurrentlyVisible(sop, maxVisibleDistance))
-                        {
+                        if (objectIsCurrentlyVisible(sop, maxVisibleDistance)) {
 #if UNITY_EDITOR
                             Debug.Log(position);
                             Debug.Log(r);
@@ -8712,11 +7445,9 @@ public void GetPositionsObjectVisibleFrom(ServerAction action)
             actionFinished(true);
         }
 
-        public void WorldToViewportPoint(Vector3 position)
-        {
+        public void WorldToViewportPoint(Vector3 position) {
             Vector3 point = m_Camera.WorldToViewportPoint(position);
-            if (point.x < 0f || point.x > 1.0f || point.y < 0f || point.y > 1.0f)
-            {
+            if (point.x < 0f || point.x > 1.0f || point.y < 0f || point.y > 1.0f) {
                 errorMessage = "Point not in viewport.";
                 actionFinished(false);
                 return;
@@ -8729,26 +7460,21 @@ public void WorldToViewportPoint(Vector3 position)
         protected float approxPercentScreenObjectOccupies(
             SimObjPhysics sop,
             bool updateVisibilityColliders = true
-        )
-        {
+        ) {
             float percent = 0.0f;
-            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0)
-            {
+            if (sop.VisibilityPoints != null && sop.VisibilityPoints.Length > 0) {
                 float minX = 1.0f;
                 float maxX = 0.0f;
                 float minY = 1.0f;
                 float maxY = 0.0f;
 
-                if (updateVisibilityColliders)
-                {
+                if (updateVisibilityColliders) {
                     updateAllAgentCollidersForVisibilityCheck(false);
                 }
-                foreach (Transform point in sop.VisibilityPoints)
-                {
+                foreach (Transform point in sop.VisibilityPoints) {
                     Vector3 viewPoint = m_Camera.WorldToViewportPoint(point.position);
 
-                    if (CheckIfVisibilityPointInViewport(sop, point, m_Camera, false).visible)
-                    {
+                    if (CheckIfVisibilityPointInViewport(sop, point, m_Camera, false).visible) {
                         minX = Math.Min(viewPoint.x, minX);
                         maxX = Math.Max(viewPoint.x, maxX);
                         minY = Math.Min(viewPoint.y, minY);
@@ -8756,8 +7482,7 @@ protected float approxPercentScreenObjectOccupies(
                     }
                 }
                 percent = Math.Max(0f, maxX - minX) * Math.Max(0f, maxY - minY);
-                if (updateVisibilityColliders)
-                {
+                if (updateVisibilityColliders) {
                     updateAllAgentCollidersForVisibilityCheck(true);
                 }
             }
@@ -8767,10 +7492,8 @@ protected float approxPercentScreenObjectOccupies(
             return percent;
         }
 
-        public void ApproxPercentScreenObjectOccupies(string objectId)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void ApproxPercentScreenObjectOccupies(string objectId) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 actionFinishedEmit(false);
                 return;
@@ -8779,10 +7502,8 @@ public void ApproxPercentScreenObjectOccupies(string objectId)
             actionFinishedEmit(true, approxPercentScreenObjectOccupies(sop));
         }
 
-        public void ApproxPercentScreenObjectFromPositions(ServerAction action)
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId))
-            {
+        public void ApproxPercentScreenObjectFromPositions(ServerAction action) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(action.objectId)) {
                 errorMessage = "Cannot find object with id " + action.objectId;
                 actionFinished(false);
                 return;
@@ -8790,12 +7511,9 @@ public void ApproxPercentScreenObjectFromPositions(ServerAction action)
             SimObjPhysics sop = physicsSceneManager.ObjectIdToSimObjPhysics[action.objectId];
 
             Vector3[] positions = null;
-            if (action.positions != null && action.positions.Count != 0)
-            {
+            if (action.positions != null && action.positions.Count != 0) {
                 positions = action.positions.ToArray();
-            }
-            else
-            {
+            } else {
                 positions = getReachablePositions();
             }
 
@@ -8806,15 +7524,12 @@ public void ApproxPercentScreenObjectFromPositions(ServerAction action)
             List<float[]> positionAndApproxAmountVisible = new List<float[]>();
 
             updateAllAgentCollidersForVisibilityCheck(false);
-            foreach (Vector3 position in positions)
-            {
+            foreach (Vector3 position in positions) {
                 transform.position = position;
-                foreach (float rotation in rotations)
-                {
+                foreach (float rotation in rotations) {
                     transform.rotation = Quaternion.Euler(0f, rotation, 0f);
                     float approxVisible = approxPercentScreenObjectOccupies(sop, false);
-                    if (approxVisible > 0.0f)
-                    {
+                    if (approxVisible > 0.0f) {
                         float[] tuple =
                         {
                             position.x,
@@ -8833,17 +7548,13 @@ public void ApproxPercentScreenObjectFromPositions(ServerAction action)
             actionFinishedEmit(true, positionAndApproxAmountVisible);
         }
 
-        public void GetVisibilityPointsOfObjects()
-        {
+        public void GetVisibilityPointsOfObjects() {
             Dictionary<string, List<Vector3>> objectIdToVisibilityPoints =
                 new Dictionary<string, List<Vector3>>();
-            foreach (SimObjPhysics sop in physicsSceneManager.ObjectIdToSimObjPhysics.Values)
-            {
+            foreach (SimObjPhysics sop in physicsSceneManager.ObjectIdToSimObjPhysics.Values) {
                 objectIdToVisibilityPoints[sop.ObjectID] = new List<Vector3>();
-                if (sop.VisibilityPoints != null)
-                {
-                    foreach (Transform t in sop.VisibilityPoints)
-                    {
+                if (sop.VisibilityPoints != null) {
+                    foreach (Transform t in sop.VisibilityPoints) {
                         objectIdToVisibilityPoints[sop.ObjectID].Add(t.position);
                     }
                 }
@@ -8851,15 +7562,11 @@ public void GetVisibilityPointsOfObjects()
             actionFinished(true, objectIdToVisibilityPoints);
         }
 
-        public void ObjectsVisibleFromPositions(ServerAction action)
-        {
+        public void ObjectsVisibleFromPositions(ServerAction action) {
             Vector3[] positions = null;
-            if (action.positions != null && action.positions.Count != 0)
-            {
+            if (action.positions != null && action.positions.Count != 0) {
                 positions = action.positions.ToArray();
-            }
-            else
-            {
+            } else {
                 positions = getReachablePositions();
             }
 
@@ -8870,21 +7577,17 @@ public void ObjectsVisibleFromPositions(ServerAction action)
             Dictionary<string, List<float[]>> objectIdToVisiblePositions =
                 new Dictionary<string, List<float[]>>();
 
-            foreach (Vector3 position in positions)
-            {
+            foreach (Vector3 position in positions) {
                 transform.position = position;
-                foreach (float rotation in rotations)
-                {
+                foreach (float rotation in rotations) {
                     transform.rotation = Quaternion.Euler(0f, rotation, 0f);
                     foreach (
                         SimObjPhysics sop in GetAllVisibleSimObjPhysics(
                             m_Camera,
                             maxVisibleDistance
                         )
-                    )
-                    {
-                        if (!objectIdToVisiblePositions.ContainsKey(sop.ObjectID))
-                        {
+                    ) {
+                        if (!objectIdToVisiblePositions.ContainsKey(sop.ObjectID)) {
                             objectIdToVisiblePositions[sop.ObjectID] = new List<float[]>();
                         }
                         List<float[]> l = objectIdToVisiblePositions[sop.ObjectID];
@@ -8906,34 +7609,28 @@ SimObjPhysics sop in GetAllVisibleSimObjPhysics(
             actionFinished(true, objectIdToVisiblePositions);
         }
 
-        public void StackBooks()
-        {
+        public void StackBooks() {
             GameObject topLevelObject = GameObject.Find("HideAndSeek");
             SimObjPhysics[] hideSeekObjects =
                 topLevelObject.GetComponentsInChildren<SimObjPhysics>();
 
             HashSet<string> seenBooks = new HashSet<string>();
             List<HashSet<SimObjPhysics>> groups = new List<HashSet<SimObjPhysics>>();
-            foreach (SimObjPhysics sop in hideSeekObjects)
-            {
+            foreach (SimObjPhysics sop in hideSeekObjects) {
                 HashSet<SimObjPhysics> group = new HashSet<SimObjPhysics>();
-                if (sop.ObjectID.StartsWith("Book|"))
-                {
-                    if (!seenBooks.Contains(sop.ObjectID))
-                    {
+                if (sop.ObjectID.StartsWith("Book|")) {
+                    if (!seenBooks.Contains(sop.ObjectID)) {
                         HashSet<SimObjPhysics> objectsNearBook = objectsInBox(
                             sop.transform.position.x,
                             sop.transform.position.z
                         );
                         group.Add(sop);
                         seenBooks.Add(sop.ObjectID);
-                        foreach (SimObjPhysics possibleBook in objectsNearBook)
-                        {
+                        foreach (SimObjPhysics possibleBook in objectsNearBook) {
                             if (
                                 possibleBook.ObjectID.StartsWith("Book|")
                                 && !seenBooks.Contains(possibleBook.ObjectID)
-                            )
-                            {
+                            ) {
                                 group.Add(possibleBook);
                                 seenBooks.Add(possibleBook.ObjectID);
                             }
@@ -8943,17 +7640,14 @@ public void StackBooks()
                 }
             }
 
-            foreach (HashSet<SimObjPhysics> group in groups)
-            {
+            foreach (HashSet<SimObjPhysics> group in groups) {
                 SimObjPhysics topBook = null;
                 GameObject topMesh = null;
                 GameObject topColliders = null;
                 GameObject topTrigColliders = null;
                 GameObject topVisPoints = null;
-                foreach (SimObjPhysics so in group)
-                {
-                    if (topBook == null)
-                    {
+                foreach (SimObjPhysics so in group) {
+                    if (topBook == null) {
                         topBook = so;
                         topMesh = so.gameObject.transform.Find("mesh").gameObject;
                         topColliders = so.gameObject.transform.Find("Colliders").gameObject;
@@ -8961,17 +7655,13 @@ public void StackBooks()
                             .gameObject.transform.Find("TriggerColliders")
                             .gameObject;
                         topVisPoints = so.gameObject.transform.Find("VisibilityPoints").gameObject;
-                    }
-                    else
-                    {
+                    } else {
                         GameObject mesh = so.gameObject.transform.Find("mesh").gameObject;
                         mesh.transform.parent = topMesh.transform;
 
                         GameObject colliders = so.gameObject.transform.Find("Colliders").gameObject;
-                        foreach (Transform t in colliders.GetComponentsInChildren<Transform>())
-                        {
-                            if (t != colliders.transform)
-                            {
+                        foreach (Transform t in colliders.GetComponentsInChildren<Transform>()) {
+                            if (t != colliders.transform) {
                                 t.parent = topColliders.transform;
                             }
                         }
@@ -8979,10 +7669,8 @@ public void StackBooks()
                         GameObject trigColliders = so
                             .gameObject.transform.Find("TriggerColliders")
                             .gameObject;
-                        foreach (Transform t in trigColliders.GetComponentsInChildren<Transform>())
-                        {
-                            if (t != colliders.transform)
-                            {
+                        foreach (Transform t in trigColliders.GetComponentsInChildren<Transform>()) {
+                            if (t != colliders.transform) {
                                 t.parent = topTrigColliders.transform;
                             }
                         }
@@ -8990,10 +7678,8 @@ public void StackBooks()
                         GameObject visPoints = so
                             .gameObject.transform.Find("VisibilityPoints")
                             .gameObject;
-                        foreach (Transform t in visPoints.GetComponentsInChildren<Transform>())
-                        {
-                            if (t != visPoints.transform)
-                            {
+                        foreach (Transform t in visPoints.GetComponentsInChildren<Transform>()) {
+                            if (t != visPoints.transform) {
                                 t.parent = topVisPoints.transform;
                             }
                         }
@@ -9007,20 +7693,17 @@ public void StackBooks()
         }
 
         // hide and seek action
-        public void RandomizeHideSeekObjects(int randomSeed, float removeProb)
-        {
+        public void RandomizeHideSeekObjects(int randomSeed, float removeProb) {
             // NOTE: this does not use systemRandom
             var rnd = new System.Random(randomSeed);
 
-            if (!physicsSceneManager.ToggleHideAndSeek(true))
-            {
+            if (!physicsSceneManager.ToggleHideAndSeek(true)) {
                 errorMessage = "Hide and Seek object reference not set, nothing to randomize.";
                 actionFinished(false);
                 return;
             }
 
-            foreach (Transform child in physicsSceneManager.HideAndSeek.transform)
-            {
+            foreach (Transform child in physicsSceneManager.HideAndSeek.transform) {
                 child.gameObject.SetActive(rnd.NextDouble() > removeProb);
             }
             physicsSceneManager.SetupScene();
@@ -9076,15 +7759,11 @@ public void RandomlyOpenCloseObjects(
             bool simplifyPhysics = false,
             float pOpen = 0.5f,
             bool randOpenness = true
-        )
-        {
-            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
-                if (so.GetComponent<CanOpen_Object>())
-                {
+        ) {
+            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
+                if (so.GetComponent<CanOpen_Object>()) {
                     // randomly opens an object to a random openness
-                    if (UnityEngine.Random.value < pOpen)
-                    {
+                    if (UnityEngine.Random.value < pOpen) {
                         openObject(
                             target: so,
                             openness: randOpenness ? UnityEngine.Random.value : 1,
@@ -9098,25 +7777,20 @@ public void RandomlyOpenCloseObjects(
             actionFinished(true);
         }
 
-        public void GetApproximateVolume(string objectId)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void GetApproximateVolume(string objectId) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 SimObjPhysics so = physicsSceneManager.ObjectIdToSimObjPhysics[objectId];
                 Quaternion oldRotation = so.transform.rotation;
                 so.transform.rotation = Quaternion.identity;
                 Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
                 bool hasActiveRenderer = false;
-                foreach (Renderer r in so.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in so.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         hasActiveRenderer = true;
                         objBounds.Encapsulate(r.bounds);
                     }
                 }
-                if (!hasActiveRenderer)
-                {
+                if (!hasActiveRenderer) {
                     errorMessage =
                         "Cannot get bounds for "
                         + objectId
@@ -9131,34 +7805,27 @@ public void GetApproximateVolume(string objectId)
                 Debug.Log("Volume is " + actionFloatReturn);
 #endif
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Invalid objectId " + objectId;
                 actionFinished(false);
             }
         }
 
-        public void GetVolumeOfAllObjects()
-        {
+        public void GetVolumeOfAllObjects() {
             List<string> objectIds = new List<string>();
             List<float> volumes = new List<float>();
-            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
+            foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
                 Quaternion oldRotation = so.transform.rotation;
                 so.transform.rotation = Quaternion.identity;
                 Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
                 bool hasActiveRenderer = false;
-                foreach (Renderer r in so.GetComponentsInChildren<Renderer>())
-                {
-                    if (r.enabled)
-                    {
+                foreach (Renderer r in so.GetComponentsInChildren<Renderer>()) {
+                    if (r.enabled) {
                         hasActiveRenderer = true;
                         objBounds.Encapsulate(r.bounds);
                     }
                 }
-                if (!hasActiveRenderer)
-                {
+                if (!hasActiveRenderer) {
                     continue;
                 }
                 so.transform.rotation = oldRotation;
@@ -9176,19 +7843,15 @@ protected void changeObjectBlendMode(
             SimObjPhysics so,
             StandardShaderUtils.BlendMode bm,
             float alpha
-        )
-        {
+        ) {
             HashSet<MeshRenderer> renderersToSkip = new HashSet<MeshRenderer>();
-            foreach (SimObjPhysics childSo in so.GetComponentsInChildren<SimObjPhysics>())
-            {
+            foreach (SimObjPhysics childSo in so.GetComponentsInChildren<SimObjPhysics>()) {
                 if (
                     !childSo.ObjectID.StartsWith("Drawer")
                     && !childSo.ObjectID.Split('|')[0].EndsWith("Door")
                     && so.ObjectID != childSo.ObjectID
-                )
-                {
-                    foreach (MeshRenderer mr in childSo.GetComponentsInChildren<MeshRenderer>())
-                    {
+                ) {
+                    foreach (MeshRenderer mr in childSo.GetComponentsInChildren<MeshRenderer>()) {
                         renderersToSkip.Add(mr);
                     }
                 }
@@ -9197,13 +7860,10 @@ float alpha
             foreach (
                 MeshRenderer r in so.gameObject.GetComponentsInChildren<MeshRenderer>()
                     as MeshRenderer[]
-            )
-            {
-                if (!renderersToSkip.Contains(r))
-                {
+            ) {
+                if (!renderersToSkip.Contains(r)) {
                     Material[] newMaterials = new Material[r.materials.Length];
-                    for (int i = 0; i < newMaterials.Length; i++)
-                    {
+                    for (int i = 0; i < newMaterials.Length; i++) {
                         newMaterials[i] = new Material(r.materials[i]);
                         StandardShaderUtils.ChangeRenderMode(newMaterials[i], bm);
                         Color color = newMaterials[i].color;
@@ -9215,77 +7875,60 @@ as MeshRenderer[]
             }
         }
 
-        public void MakeObjectTransparent(string objectId)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void MakeObjectTransparent(string objectId) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 changeObjectBlendMode(
                     physicsSceneManager.ObjectIdToSimObjPhysics[objectId],
                     StandardShaderUtils.BlendMode.Fade,
                     0.4f
                 );
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Invalid objectId " + objectId;
                 actionFinished(false);
             }
         }
 
-        public void MakeObjectOpaque(string objectId)
-        {
-            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        public void MakeObjectOpaque(string objectId) {
+            if (physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 changeObjectBlendMode(
                     physicsSceneManager.ObjectIdToSimObjPhysics[objectId],
                     StandardShaderUtils.BlendMode.Opaque,
                     1.0f
                 );
                 actionFinished(true);
-            }
-            else
-            {
+            } else {
                 errorMessage = "Invalid objectId " + objectId;
                 actionFinished(false);
             }
         }
 
-        public void UnmaskWalkable()
-        {
+        public void UnmaskWalkable() {
             GameObject walkableParent = GameObject.Find("WalkablePlanes");
-            if (walkableParent != null)
-            {
-                foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-                {
+            if (walkableParent != null) {
+                foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
                     unmaskGameObject(go);
                 }
-                foreach (Renderer r in walkableParent.GetComponentsInChildren<Renderer>())
-                {
+                foreach (Renderer r in walkableParent.GetComponentsInChildren<Renderer>()) {
                     r.enabled = false;
                 }
             }
             actionFinished(true);
         }
 
-        public void MaskWalkable()
-        {
+        public void MaskWalkable() {
             Material backgroundMaterial = new Material(Shader.Find("Unlit/Color"));
             backgroundMaterial.color = Color.green;
 
-            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>())
-            {
-                if (!ancestorHasName(go, "WalkablePlanes"))
-                {
+            foreach (GameObject go in GameObject.FindObjectsOfType<GameObject>()) {
+                if (!ancestorHasName(go, "WalkablePlanes")) {
                     maskGameObject(go, backgroundMaterial);
                 }
             }
 
             GameObject walkableParent = GameObject.Find("WalkablePlanes");
-            if (walkableParent != null)
-            {
-                foreach (Renderer r in walkableParent.GetComponentsInChildren<Renderer>())
-                {
+            if (walkableParent != null) {
+                foreach (Renderer r in walkableParent.GetComponentsInChildren<Renderer>()) {
                     r.enabled = true;
                 }
                 actionFinished(true);
@@ -9296,8 +7939,7 @@ public void MaskWalkable()
             walkableParent = new GameObject();
             walkableParent.name = "WalkablePlanes";
             GameObject topLevelObject = GameObject.Find("Objects");
-            if (topLevelObject != null)
-            {
+            if (topLevelObject != null) {
                 walkableParent.transform.parent = topLevelObject.transform;
             }
 
@@ -9308,36 +7950,28 @@ public void MaskWalkable()
                 "Procedural3",
                 "Procedural0"
             );
-            foreach (Vector3 p in reachablePositions)
-            {
+            foreach (Vector3 p in reachablePositions) {
                 RaycastHit hit;
                 bool somethingHit = false;
                 float y = 0f;
-                for (int i = -1; i <= 1; i++)
-                {
-                    for (int j = -1; j <= 1; j++)
-                    {
+                for (int i = -1; i <= 1; i++) {
+                    for (int j = -1; j <= 1; j++) {
                         Vector3 offset = new Vector3(
                             i * 0.41f * gridSize,
                             0f,
                             i * 0.41f * gridSize
                         );
-                        if (Physics.Raycast(p + offset, -transform.up, out hit, 10f, layerMask))
-                        {
-                            if (!somethingHit)
-                            {
+                        if (Physics.Raycast(p + offset, -transform.up, out hit, 10f, layerMask)) {
+                            if (!somethingHit) {
                                 y = hit.point.y;
-                            }
-                            else
-                            {
+                            } else {
                                 y = Math.Max(y, hit.point.y);
                             }
                             somethingHit = true;
                         }
                     }
                 }
-                if (somethingHit)
-                {
+                if (somethingHit) {
                     y += 0.01f;
                     y = Math.Max(y, 0.05f);
                     GameObject plane =
@@ -9362,27 +7996,21 @@ private IEnumerator CoverSurfacesWithHelper(
             int n,
             List<SimObjPhysics> newObjects,
             Vector3[] reachablePositions
-        )
-        {
+        ) {
             Vector3[] initialPositions = new Vector3[newObjects.Count];
             int k = 0;
             bool[] deleted = new bool[newObjects.Count];
-            foreach (SimObjPhysics so in newObjects)
-            {
+            foreach (SimObjPhysics so in newObjects) {
                 initialPositions[k] = so.transform.position;
                 deleted[k] = false;
                 k++;
             }
-            for (int i = 0; i < n; i++)
-            {
+            for (int i = 0; i < n; i++) {
                 k = 0;
-                foreach (SimObjPhysics so in newObjects)
-                {
-                    if (!deleted[k])
-                    {
+                foreach (SimObjPhysics so in newObjects) {
+                    if (!deleted[k]) {
                         float dist = Vector3.Distance(initialPositions[k], so.transform.position);
-                        if (dist > 0.5f)
-                        {
+                        if (dist > 0.5f) {
                             deleted[k] = true;
                             so.gameObject.SetActive(false);
                         }
@@ -9393,12 +8021,9 @@ Vector3[] reachablePositions
             }
 
             HashSet<string> objectIdsContained = new HashSet<string>();
-            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values)
-            {
-                if (objectIsOfIntoType(so))
-                {
-                    foreach (string id in so.GetAllSimObjectsInReceptacleTriggersByObjectID())
-                    {
+            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values) {
+                if (objectIsOfIntoType(so)) {
+                    foreach (string id in so.GetAllSimObjectsInReceptacleTriggersByObjectID()) {
                         objectIdsContained.Add(id);
                     }
                 }
@@ -9410,24 +8035,17 @@ Vector3[] reachablePositions
                 .Find("FPSController")
                 .GetComponentsInChildren<Collider>();
             k = 0;
-            foreach (SimObjPhysics so in newObjects)
-            {
-                if (!deleted[k])
-                {
+            foreach (SimObjPhysics so in newObjects) {
+                if (!deleted[k]) {
                     so.GetComponentInChildren<Rigidbody>().isKinematic = true;
-                    foreach (Collider c1 in so.GetComponentsInChildren<Collider>())
-                    {
-                        foreach (Collider c in fpsControllerColliders)
-                        {
+                    foreach (Collider c1 in so.GetComponentsInChildren<Collider>()) {
+                        foreach (Collider c in fpsControllerColliders) {
                             Physics.IgnoreCollision(c, c1);
                         }
                     }
-                    if (objectIdsContained.Contains(so.ObjectID))
-                    {
+                    if (objectIdsContained.Contains(so.ObjectID)) {
                         MaskSimObj(so, greenMaterial);
-                    }
-                    else
-                    {
+                    } else {
                         MaskSimObj(so, redMaterial);
                     }
                     physicsSceneManager.AddToObjectsInScene(so);
@@ -9438,10 +8056,8 @@ Vector3[] reachablePositions
             HashSet<SimObjPhysics> visibleObjects = getAllItemsVisibleFromPositions(
                 reachablePositions
             );
-            foreach (SimObjPhysics so in newObjects)
-            {
-                if (so.gameObject.activeSelf && !visibleObjects.Contains(so))
-                {
+            foreach (SimObjPhysics so in newObjects) {
+                if (so.gameObject.activeSelf && !visibleObjects.Contains(so)) {
                     so.gameObject.SetActive(false);
                     physicsSceneManager.ObjectIdToSimObjPhysics.Remove(so.ObjectID);
                 }
@@ -9450,8 +8066,7 @@ Vector3[] reachablePositions
             actionFinished(true);
         }
 
-        private void createCubeSurrounding(Bounds bounds)
-        {
+        private void createCubeSurrounding(Bounds bounds) {
             Vector3 center = bounds.center;
             Vector3 max = bounds.max;
             Vector3 min = bounds.min;
@@ -9545,13 +8160,11 @@ private List<RaycastHit> RaycastWithRepeatHits(
             Vector3 direction,
             float maxDistance,
             int layerMask
-        )
-        {
+        ) {
             List<RaycastHit> hits = new List<RaycastHit>();
             RaycastHit hit;
             bool didHit = Physics.Raycast(origin, direction, out hit, maxDistance, layerMask);
-            while (didHit)
-            {
+            while (didHit) {
                 hits.Add(hit);
                 origin = hit.point + direction / 100f;
                 hit = new RaycastHit();
@@ -9560,60 +8173,47 @@ int layerMask
             return hits;
         }
 
-        public void setAllObjectsToMaterial(Material material)
-        {
+        public void setAllObjectsToMaterial(Material material) {
             GameObject go = GameObject.Find("Lighting");
-            if (go != null)
-            {
+            if (go != null) {
                 go.SetActive(false);
             }
-            foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>())
-            {
+            foreach (Renderer r in GameObject.FindObjectsOfType<Renderer>()) {
                 bool disableRenderer = false;
-                foreach (Material m in r.materials)
-                {
-                    if (m.name.Contains("LightRay"))
-                    {
+                foreach (Material m in r.materials) {
+                    if (m.name.Contains("LightRay")) {
                         disableRenderer = true;
                         break;
                     }
                 }
-                if (disableRenderer)
-                {
+                if (disableRenderer) {
                     r.enabled = false;
-                }
-                else
-                {
+                } else {
                     Material[] newMaterials = new Material[r.materials.Length];
-                    for (int i = 0; i < newMaterials.Length; i++)
-                    {
+                    for (int i = 0; i < newMaterials.Length; i++) {
                         newMaterials[i] = material;
                     }
                     r.materials = newMaterials;
                 }
             }
-            foreach (Light l in GameObject.FindObjectsOfType<Light>())
-            {
+            foreach (Light l in GameObject.FindObjectsOfType<Light>()) {
                 l.enabled = false;
             }
             RenderSettings.ambientMode = AmbientMode.Flat;
             RenderSettings.ambientLight = Color.white;
         }
 
-        public void SetAllObjectsToBlueUnlit()
-        {
+        public void SetAllObjectsToBlueUnlit() {
             setAllObjectsToMaterial((Material)Resources.Load("BLUE", typeof(Material)));
             actionFinished(true);
         }
 
-        public void SetAllObjectsToBlueStandard()
-        {
+        public void SetAllObjectsToBlueStandard() {
             setAllObjectsToMaterial((Material)Resources.Load("BLUE_standard", typeof(Material)));
             actionFinished(true);
         }
 
-        public void EnableFog(float z)
-        {
+        public void EnableFog(float z) {
             GlobalFog gf = m_Camera.GetComponent<GlobalFog>();
             gf.enabled = true;
             gf.heightFog = false;
@@ -9626,24 +8226,19 @@ public void EnableFog(float z)
             actionFinished(true);
         }
 
-        public void DisableFog()
-        {
+        public void DisableFog() {
             m_Camera.GetComponent<GlobalFog>().enabled = false;
             RenderSettings.fog = false;
             actionFinished(true);
         }
 
-        public void ColorSurfaceColorObjectsByDistance(float z)
-        {
+        public void ColorSurfaceColorObjectsByDistance(float z) {
             GameObject surfaceCoverObjects = GameObject.Find("SurfaceCoverObjects");
 
             HashSet<string> objectIdsContained = new HashSet<string>();
-            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values)
-            {
-                if (objectIsOfIntoType(so))
-                {
-                    foreach (string id in so.GetAllSimObjectsInReceptacleTriggersByObjectID())
-                    {
+            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values) {
+                if (objectIsOfIntoType(so)) {
+                    foreach (string id in so.GetAllSimObjectsInReceptacleTriggersByObjectID()) {
                         objectIdsContained.Add(id);
                     }
                 }
@@ -9651,18 +8246,14 @@ public void ColorSurfaceColorObjectsByDistance(float z)
 
             foreach (
                 SimObjPhysics sop in surfaceCoverObjects.GetComponentsInChildren<SimObjPhysics>()
-            )
-            {
+            ) {
                 Material newMaterial;
                 float minRed = 0.0f;
                 float minGreen = 0.0f;
                 newMaterial = new Material(Shader.Find("Unlit/Color"));
-                if (objectIdsContained.Contains(sop.ObjectID))
-                {
+                if (objectIdsContained.Contains(sop.ObjectID)) {
                     minGreen = 1.0f;
-                }
-                else
-                {
+                } else {
                     minRed = 1.0f;
                 }
 
@@ -9683,8 +8274,7 @@ SimObjPhysics sop in surfaceCoverObjects.GetComponentsInChildren<SimObjPhysics>(
             actionFinished(true);
         }
 
-        public void CoverSurfacesWith(ServerAction action)
-        {
+        public void CoverSurfacesWith(ServerAction action) {
             string prefab = action.objectType;
             int objectVariation = action.objectVariation;
             Vector3[] reachablePositions = getReachablePositions();
@@ -9720,8 +8310,7 @@ public void CoverSurfacesWith(ServerAction action)
             );
 
             Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
-            foreach (Renderer r in objForBounds.GetComponentsInChildren<Renderer>())
-            {
+            foreach (Renderer r in objForBounds.GetComponentsInChildren<Renderer>()) {
                 objBounds.Encapsulate(r.bounds);
             }
             Vector3 objCenterRelPos = objBounds.center - objForBounds.transform.position;
@@ -9747,20 +8336,16 @@ public void CoverSurfacesWith(ServerAction action)
             var zsToTry = new List<float>();
             // xsToTry.Add(-0.1253266f);
             // zsToTry.Add(1.159979f);
-            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>())
-            {
-                if (go.name == "ReceptacleTriggerBox")
-                {
+            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>()) {
+                if (go.name == "ReceptacleTriggerBox") {
                     Vector3 receptCenter = go.transform.position;
                     xsToTry.Add(receptCenter.x);
                     zsToTry.Add(receptCenter.z);
                 }
             }
-            for (int i = 0; i < numXSteps; i++)
-            {
+            for (int i = 0; i < numXSteps; i++) {
                 float x = b.min.x + (0.5f + i) * xStepSize;
-                for (int j = 0; j < numZSteps; j++)
-                {
+                for (int j = 0; j < numZSteps; j++) {
                     float z = b.min.z + (0.5f + j) * zStepSize;
                     xsToTry.Add(x);
                     zsToTry.Add(z);
@@ -9776,8 +8361,7 @@ public void CoverSurfacesWith(ServerAction action)
                 "Procedural3",
                 "Procedural0"
             );
-            for (int i = 0; i < xsToTryArray.Length; i++)
-            {
+            for (int i = 0; i < xsToTryArray.Length; i++) {
                 float xPos = xsToTryArray[i];
                 float zPos = zsToTryArray[i];
 
@@ -9788,8 +8372,7 @@ public void CoverSurfacesWith(ServerAction action)
                     layerMask
                 );
                 int k = -1;
-                foreach (RaycastHit hit in hits)
-                {
+                foreach (RaycastHit hit in hits) {
                     if (
                         b.Contains(hit.point)
                         && hit.point.y < transform.position.y + 1.2f
@@ -9800,12 +8383,10 @@ public void CoverSurfacesWith(ServerAction action)
                             layerMask,
                             hit.collider.transform.gameObject
                         )
-                    )
-                    {
+                    ) {
                         SimObjPhysics hitSimObj =
                             hit.transform.gameObject.GetComponent<SimObjPhysics>();
-                        if (hitSimObj == null || hitSimObj.ObjectID.Split('|')[0] != prefab)
-                        {
+                        if (hitSimObj == null || hitSimObj.ObjectID.Split('|')[0] != prefab) {
                             Vector3 halfExtents = new Vector3(
                                 xExtent / 2.1f,
                                 yExtent / 2.1f,
@@ -9818,8 +8399,7 @@ public void CoverSurfacesWith(ServerAction action)
                                 Quaternion.identity,
                                 layerMask
                             );
-                            if (colliders.Length == 0)
-                            {
+                            if (colliders.Length == 0) {
                                 k++;
                                 SimObjPhysics newObj = script.SpawnObject(
                                     prefab,
@@ -9830,12 +8410,10 @@ public void CoverSurfacesWith(ServerAction action)
                                     false,
                                     true
                                 );
-                                if (prefab == "Cup")
-                                {
+                                if (prefab == "Cup") {
                                     foreach (
                                         Collider c in newObj.GetComponentsInChildren<Collider>()
-                                    )
-                                    {
+                                    ) {
                                         c.enabled = false;
                                     }
                                     newObj
@@ -9851,8 +8429,7 @@ Collider c in newObj.GetComponentsInChildren<Collider>()
             GameObject topLevelObject = GameObject.Find("Objects");
             GameObject newTopLevelObject = new GameObject("SurfaceCoverObjects");
             newTopLevelObject.transform.parent = topLevelObject.transform;
-            foreach (SimObjPhysics sop in newObjects)
-            {
+            foreach (SimObjPhysics sop in newObjects) {
                 sop.gameObject.transform.parent = newTopLevelObject.transform;
             }
             StartCoroutine(CoverSurfacesWithHelper(100, newObjects, reachablePositions));
@@ -9861,40 +8438,32 @@ Collider c in newObj.GetComponentsInChildren<Collider>()
         public void NumberOfPositionsObjectsOfTypeAreVisibleFrom(
             string objectType,
             Vector3[] positions
-        )
-        {
+        ) {
 #if UNITY_EDITOR
-            if (positions == null || positions.Length == 0)
-            {
+            if (positions == null || positions.Length == 0) {
                 List<SimObjPhysics> toReEnable = new List<SimObjPhysics>();
-                foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-                {
-                    if (sop.Type.ToString().ToLower() == objectType.ToLower())
-                    {
+                foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
+                    if (sop.Type.ToString().ToLower() == objectType.ToLower()) {
                         toReEnable.Add(sop);
                         sop.gameObject.SetActive(false);
                     }
                 }
-                foreach (SimObjPhysics sop in toReEnable)
-                {
+                foreach (SimObjPhysics sop in toReEnable) {
                     sop.gameObject.SetActive(true);
                 }
             }
 #endif
 
             List<SimObjPhysics> objectsOfType = new List<SimObjPhysics>();
-            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-            {
-                if (sop.Type.ToString().ToLower() == objectType.ToLower())
-                {
+            foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
+                if (sop.Type.ToString().ToLower() == objectType.ToLower()) {
                     objectsOfType.Add(sop);
                     sop.gameObject.SetActive(false);
                 }
             }
 
             Dictionary<String, int> objectIdToPositionsVisibleFrom = new Dictionary<String, int>();
-            foreach (SimObjPhysics sop in objectsOfType)
-            {
+            foreach (SimObjPhysics sop in objectsOfType) {
                 sop.gameObject.SetActive(true);
                 objectIdToPositionsVisibleFrom.Add(
                     sop.ObjectID,
@@ -9912,31 +8481,25 @@ Vector3[] positions
                 sop.gameObject.SetActive(false);
             }
 
-            foreach (SimObjPhysics sop in objectsOfType)
-            {
+            foreach (SimObjPhysics sop in objectsOfType) {
                 sop.gameObject.SetActive(true);
             }
 
             actionFinished(true, objectIdToPositionsVisibleFrom);
         }
 
-        private IEnumerator SpamObjectsInRoomHelper(int n, List<SimObjPhysics> newObjects)
-        {
-            for (int i = 0; i < n; i++)
-            {
+        private IEnumerator SpamObjectsInRoomHelper(int n, List<SimObjPhysics> newObjects) {
+            for (int i = 0; i < n; i++) {
                 yield return null;
             }
 
             Collider[] fpsControllerColliders = GameObject
                 .Find("FPSController")
                 .GetComponentsInChildren<Collider>();
-            foreach (SimObjPhysics so in newObjects)
-            {
+            foreach (SimObjPhysics so in newObjects) {
                 so.GetComponentInChildren<Rigidbody>().isKinematic = true;
-                foreach (Collider c1 in so.GetComponentsInChildren<Collider>())
-                {
-                    foreach (Collider c in fpsControllerColliders)
-                    {
+                foreach (Collider c1 in so.GetComponentsInChildren<Collider>()) {
+                    foreach (Collider c in fpsControllerColliders) {
                         Physics.IgnoreCollision(c, c1);
                     }
                 }
@@ -9946,8 +8509,7 @@ private IEnumerator SpamObjectsInRoomHelper(int n, List<SimObjPhysics> newObject
             actionFinished(true);
         }
 
-        public void SpamObjectsInRoom(int randomSeed = 0)
-        {
+        public void SpamObjectsInRoom(int randomSeed = 0) {
             UnityEngine.Random.InitState(randomSeed);
 
             string[] objectTypes = { "Bread", "Cup", "Footstool", "Knife", "Plunger", "Tomato", };
@@ -9975,10 +8537,8 @@ public void SpamObjectsInRoom(int randomSeed = 0)
             List<Vector3> objsCenterRelPos = new List<Vector3>();
             List<Vector3> yOffsets = new List<Vector3>();
             float offset = 10f;
-            foreach (string objType in objectTypes)
-            {
-                for (int i = 1; i < numObjectVariations; i++)
-                {
+            foreach (string objType in objectTypes) {
+                for (int i = 1; i < numObjectVariations; i++) {
                     SimObjPhysics objForBounds = script.SpawnObject(
                         objType,
                         false,
@@ -9991,8 +8551,7 @@ public void SpamObjectsInRoom(int randomSeed = 0)
                     offset += 1.0f;
 
                     Bounds objBounds = UtilityFunctions.CreateEmptyBounds();
-                    foreach (Renderer r in objForBounds.GetComponentsInChildren<Renderer>())
-                    {
+                    foreach (Renderer r in objForBounds.GetComponentsInChildren<Renderer>()) {
                         objBounds.Encapsulate(r.bounds);
                     }
 
@@ -10011,23 +8570,19 @@ public void SpamObjectsInRoom(int randomSeed = 0)
 
             var xsToTry = new List<float>();
             var zsToTry = new List<float>();
-            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>())
-            {
-                if (go.name == "ReceptacleTriggerBox")
-                {
+            foreach (GameObject go in Resources.FindObjectsOfTypeAll<GameObject>()) {
+                if (go.name == "ReceptacleTriggerBox") {
                     BoxCollider bc = go.GetComponent<BoxCollider>();
                     Bounds bcb = bc.bounds;
                     xsToTry.Add(bcb.center.x);
                     zsToTry.Add(bcb.center.z);
-                    for (int i = 0; i < 5; i++)
-                    {
+                    for (int i = 0; i < 5; i++) {
                         xsToTry.Add((bcb.max.x - bcb.min.x) * UnityEngine.Random.value + bcb.min.x);
                         zsToTry.Add((bcb.max.z - bcb.min.z) * UnityEngine.Random.value + bcb.min.z);
                     }
                 }
             }
-            for (int i = 0; i < 1000; i++)
-            {
+            for (int i = 0; i < 1000; i++) {
                 xsToTry.Add((b.max.x - b.min.x) * UnityEngine.Random.value + b.min.x);
                 zsToTry.Add((b.max.z - b.min.z) * UnityEngine.Random.value + b.min.z);
             }
@@ -10043,10 +8598,8 @@ public void SpamObjectsInRoom(int randomSeed = 0)
                 "Procedural0"
             );
             // int attempts = 0;
-            for (int i = 0; i < xsToTryArray.Length; i++)
-            {
-                if (newObjects.Count >= 100)
-                {
+            for (int i = 0; i < xsToTryArray.Length; i++) {
+                if (newObjects.Count >= 100) {
                     break;
                 }
                 float xPos = (b.max.x - b.min.x) * UnityEngine.Random.value + b.min.x;
@@ -10062,12 +8615,10 @@ public void SpamObjectsInRoom(int randomSeed = 0)
                     layerMask
                 );
 
-                foreach (RaycastHit hit in hits)
-                {
+                foreach (RaycastHit hit in hits) {
                     Bounds ob = objsBounds[objectInd];
                     Vector3 randRotation = new Vector3(0.0f, 0.0f, 0.0f);
-                    if (UnityEngine.Random.value < 0.5f)
-                    {
+                    if (UnityEngine.Random.value < 0.5f) {
                         randRotation = new Vector3(
                             UnityEngine.Random.value * 360f,
                             UnityEngine.Random.value * 360f,
@@ -10089,8 +8640,7 @@ public void SpamObjectsInRoom(int randomSeed = 0)
                         false,
                         false
                     );
-                    if (newObj == null)
-                    {
+                    if (newObj == null) {
                         newObj = script.SpawnObject(
                             objectTypes[objectInd],
                             false,
@@ -10110,14 +8660,11 @@ public void SpamObjectsInRoom(int randomSeed = 0)
                             false
                         );
                     }
-                    if (newObj != null)
-                    {
+                    if (newObj != null) {
                         newObjects.Add(newObj);
                     }
-                    if (newObj != null && objectTypes[objectInd] == "Cup")
-                    {
-                        foreach (Collider c in newObj.GetComponentsInChildren<Collider>())
-                        {
+                    if (newObj != null && objectTypes[objectInd] == "Cup") {
+                        foreach (Collider c in newObj.GetComponentsInChildren<Collider>()) {
                             c.enabled = false;
                         }
                         newObj
@@ -10130,10 +8677,8 @@ public void SpamObjectsInRoom(int randomSeed = 0)
             StartCoroutine(SpamObjectsInRoomHelper(100, newObjects));
         }
 
-        public void ChangeLightSet(ServerAction action)
-        {
-            if (action.objectVariation > 10 || action.objectVariation < 1)
-            {
+        public void ChangeLightSet(ServerAction action) {
+            if (action.objectVariation > 10 || action.objectVariation < 1) {
                 errorMessage = "Please use value between 1 and 10";
                 actionFinished(false);
                 return;
@@ -10144,24 +8689,19 @@ public void ChangeLightSet(ServerAction action)
             actionFinished(true);
         }
 
-        public void SliceObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void SliceObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
@@ -10169,12 +8709,9 @@ public void SliceObject(ServerAction action)
             }
 
             // we found it!
-            if (target)
-            {
-                if (ItemInHand != null)
-                {
-                    if (target.transform == ItemInHand.transform)
-                    {
+            if (target) {
+                if (ItemInHand != null) {
+                    if (target.transform == ItemInHand.transform) {
                         errorMessage =
                             "target object cannot be sliced if it is in the agent's hand";
                         actionFinished(false);
@@ -10188,14 +8725,11 @@ public void SliceObject(ServerAction action)
                         .DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.CanBeSliced
                         )
-                )
-                {
+                ) {
                     target.GetComponent<SliceObject>().Slice();
                     actionFinished(true);
                     return;
-                }
-                else
-                {
+                } else {
                     errorMessage =
                         target.transform.name + " Does not have the CanBeSliced property!";
                     actionFinished(false);
@@ -10203,31 +8737,25 @@ public void SliceObject(ServerAction action)
                 }
             }
             // target not found in currently visible objects, report not found
-            else
-            {
+            else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
         }
 
-        public void BreakObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void BreakObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
@@ -10235,25 +8763,21 @@ public void BreakObject(ServerAction action)
             }
 
             // we found it!
-            if (target)
-            {
+            if (target) {
                 if (
                     target
                         .GetComponent<SimObjPhysics>()
                         .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBreak)
-                )
-                {
+                ) {
                     SimObjPhysics targetsop = target.GetComponent<SimObjPhysics>();
                     // if the object is in the agent's hand, we need to reset the agent hand booleans and other cleanup as well
-                    if (targetsop.isInAgentHand)
-                    {
+                    if (targetsop.isInAgentHand) {
                         // if the target is also a Receptacle, drop contained objects first
                         if (
                             targetsop.DoesThisObjectHaveThisSecondaryProperty(
                                 SimObjSecondaryProperty.Receptacle
                             )
-                        )
-                        {
+                        ) {
                             // drop contained objects as well
                             targetsop.DropContainedObjects(
                                 reparentContainedObjects: true,
@@ -10270,17 +8794,14 @@ public void BreakObject(ServerAction action)
                     target.GetComponentInChildren<Break>().BreakObject(null);
                     actionFinished(true);
                     return;
-                }
-                else
-                {
+                } else {
                     errorMessage = target.transform.name + " does not have the CanBreak property!!";
                     actionFinished(false);
                     return;
                 }
             }
             // target not found in currently visible objects, report not found
-            else
-            {
+            else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
@@ -10292,20 +8813,17 @@ public void SpawnDirt(
             bool forceAction = true,
             int randomSeed = 0,
             DirtSpawnPosition[] spawnPositions = null
-        )
-        {
+        ) {
             SimObjPhysics target = getInteractableSimObjectFromId(
                 objectId: objectId,
                 forceAction: forceAction
             );
 
-            if (target == null)
-            {
+            if (target == null) {
                 throw new ArgumentNullException();
             }
 
-            if (target)
-            {
+            if (target) {
                 target.SpawnDirtOnReceptacle(howManyDirt, randomSeed, spawnPositions);
             }
 
@@ -10313,179 +8831,141 @@ public void SpawnDirt(
         }
 
         //currently only to be used with the Cleaning Table prefab
-        public void GetDirtCoordinateBounds(string objectId)
-        {
+        public void GetDirtCoordinateBounds(string objectId) {
             DirtCoordinateBounds toReturn = null;
             SimObjPhysics target = getInteractableSimObjectFromId(objectId: objectId, true);
 
-            if (target == null)
-            {
+            if (target == null) {
                 throw new ArgumentNullException();
             }
 
-            if (target)
-            {
+            if (target) {
                 toReturn = target.GetDirtCoordinateBounds();
             }
 
             actionFinished(true, toReturn);
         }
 
-        public void DirtyObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void DirtyObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (target)
-            {
+            if (target) {
                 if (
                     target
                         .GetComponent<SimObjPhysics>()
                         .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeDirty)
-                )
-                {
+                ) {
                     Dirty dirt = target.GetComponent<Dirty>();
-                    if (dirt.IsDirty() == false)
-                    {
+                    if (dirt.IsDirty() == false) {
                         dirt.ToggleCleanOrDirty();
                         actionFinished(true);
                         return;
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = target.transform.name + " is already dirty!";
                         actionFinished(false);
                         return;
                     }
-                }
-                else
-                {
+                } else {
                     errorMessage = target.transform.name + " does not have CanBeDirty property!";
                     actionFinished(false);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
         }
 
-        public void CleanObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void CleanObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (target)
-            {
+            if (target) {
                 if (
                     target
                         .GetComponent<SimObjPhysics>()
                         .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeDirty)
-                )
-                {
+                ) {
                     Dirty dirt = target.GetComponent<Dirty>();
-                    if (dirt.IsDirty())
-                    {
+                    if (dirt.IsDirty()) {
                         dirt.ToggleCleanOrDirty();
                         actionFinished(true);
                         return;
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = target.transform.name + " is already Clean!";
                         actionFinished(false);
                         return;
                     }
-                }
-                else
-                {
+                } else {
                     errorMessage = target.transform.name + " does not have dirtyable property!";
                     actionFinished(false);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
         }
 
         // fill an object with a liquid specified by action.fillLiquid - coffee, water, soap, wine, etc
-        public void FillObjectWithLiquid(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void FillObjectWithLiquid(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (action.fillLiquid == null)
-            {
+            if (action.fillLiquid == null) {
                 throw new InvalidOperationException("Missing Liquid string for FillObject action");
             }
 
             // ignore casing
             action.fillLiquid = action.fillLiquid.ToLower();
 
-            if (!target)
-            {
+            if (!target) {
                 throw new ArgumentException("object not found: " + action.objectId);
             }
 
@@ -10493,8 +8973,7 @@ public void FillObjectWithLiquid(ServerAction action)
                 !target
                     .GetComponent<SimObjPhysics>()
                     .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeFilled)
-            )
-            {
+            ) {
                 throw new ArgumentException(
                     target.transform.name + " does not have CanBeFilled property!"
                 );
@@ -10503,13 +8982,11 @@ public void FillObjectWithLiquid(ServerAction action)
             Fill fil = target.GetComponent<Fill>();
 
             // if the passed in liquid string is not valid
-            if (!fil.Liquids.ContainsKey(action.fillLiquid))
-            {
+            if (!fil.Liquids.ContainsKey(action.fillLiquid)) {
                 throw new ArgumentException(action.fillLiquid + " is not a valid Liquid Type");
             }
 
-            if (fil.IsFilled())
-            {
+            if (fil.IsFilled()) {
                 throw new InvalidOperationException(target.transform.name + " is already Filled!");
             }
 
@@ -10517,141 +8994,111 @@ public void FillObjectWithLiquid(ServerAction action)
             actionFinished(true);
         }
 
-        public void EmptyLiquidFromObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void EmptyLiquidFromObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (target)
-            {
+            if (target) {
                 if (
                     target
                         .GetComponent<SimObjPhysics>()
                         .DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.CanBeFilled
                         )
-                )
-                {
+                ) {
                     Fill fil = target.GetComponent<Fill>();
 
-                    if (fil.IsFilled())
-                    {
+                    if (fil.IsFilled()) {
                         fil.EmptyObject();
                         actionFinished(true);
                         return;
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = "object already empty";
                         actionFinished(false);
                         return;
                     }
-                }
-                else
-                {
+                } else {
                     errorMessage = target.transform.name + " does not have CanBeFilled property!";
                     actionFinished(false);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
         }
 
         // use up the contents of this object (toilet paper, paper towel, tissue box, etc).
-        public void UseUpObject(ServerAction action)
-        {
-            if (action.forceAction)
-            {
+        public void UseUpObject(ServerAction action) {
+            if (action.forceAction) {
                 action.forceVisible = true;
             }
 
             SimObjPhysics target = null;
-            if (action.objectId == null)
-            {
+            if (action.objectId == null) {
                 target = getInteractableSimObjectFromXY(
                     x: action.x,
                     y: action.y,
                     forceAction: action.forceAction
                 );
-            }
-            else
-            {
+            } else {
                 target = getInteractableSimObjectFromId(
                     objectId: action.objectId,
                     forceAction: action.forceAction
                 );
             }
 
-            if (target)
-            {
+            if (target) {
                 if (
                     target
                         .GetComponent<SimObjPhysics>()
                         .DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.CanBeUsedUp
                         )
-                )
-                {
+                ) {
                     UsedUp u = target.GetComponent<UsedUp>();
 
                     // make sure object is not already used up
-                    if (!u.isUsedUp)
-                    {
+                    if (!u.isUsedUp) {
                         u.UseUp();
                         actionFinished(true);
                         return;
-                    }
-                    else
-                    {
+                    } else {
                         errorMessage = "object already used up!";
                         // Debug.Log(errorMessage);
                         actionFinished(false);
                         return;
                     }
-                }
-                else
-                {
+                } else {
                     errorMessage = target.transform.name + " does not have CanBeUsedUp property!";
                     actionFinished(false);
                     return;
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage = "object not found: " + action.objectId;
                 actionFinished(false);
             }
         }
 
-        public void GetScenesInBuild()
-        {
+        public void GetScenesInBuild() {
             int sceneCount = UnityEngine.SceneManagement.SceneManager.sceneCountInBuildSettings;
             string[] scenes = new string[sceneCount];
-            for (int i = 0; i < sceneCount; i++)
-            {
+            for (int i = 0; i < sceneCount; i++) {
                 scenes[i] = System.IO.Path.GetFileNameWithoutExtension(
                     UnityEngine.SceneManagement.SceneUtility.GetScenePathByBuildIndex(i)
                 );
@@ -10659,8 +9106,7 @@ public void GetScenesInBuild()
             actionFinished(true, scenes);
         }
 
-        protected bool objectIsOfIntoType(SimObjPhysics so)
-        {
+        protected bool objectIsOfIntoType(SimObjPhysics so) {
             return so.ReceptacleTriggerBoxes != null
                 && so.ReceptacleTriggerBoxes.Length != 0
                 && !so.ObjectID.Contains("Table")
@@ -10674,13 +9120,10 @@ protected bool objectIsOfIntoType(SimObjPhysics so)
                 && !so.ObjectID.Contains("Ottoman");
         }
 
-        public void ToggleColorIntoTypeReceptacleFloors()
-        {
+        public void ToggleColorIntoTypeReceptacleFloors() {
             GameObject go = GameObject.Find("IntoObjectFloorPlanes");
-            if (go != null)
-            {
-                foreach (Renderer r in go.GetComponentsInChildren<Renderer>())
-                {
+            if (go != null) {
+                foreach (Renderer r in go.GetComponentsInChildren<Renderer>()) {
                     r.enabled = !r.enabled;
                 }
                 actionFinished(true);
@@ -10690,8 +9133,7 @@ public void ToggleColorIntoTypeReceptacleFloors()
             GameObject newParent = new GameObject();
             newParent.name = "IntoObjectFloorPlanes";
             GameObject topLevelObject = GameObject.Find("Objects");
-            if (topLevelObject != null)
-            {
+            if (topLevelObject != null) {
                 newParent.transform.parent = topLevelObject.transform;
             }
 
@@ -10702,12 +9144,9 @@ public void ToggleColorIntoTypeReceptacleFloors()
                 "Procedural3",
                 "Procedural0"
             );
-            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values)
-            {
-                if (objectIsOfIntoType(so))
-                {
-                    foreach (GameObject rtb in so.ReceptacleTriggerBoxes)
-                    {
+            foreach (SimObjPhysics so in physicsSceneManager.ObjectIdToSimObjPhysics.Values) {
+                if (objectIsOfIntoType(so)) {
+                    foreach (GameObject rtb in so.ReceptacleTriggerBoxes) {
                         Quaternion oldRotation = rtb.transform.rotation;
                         Vector3 euler = oldRotation.eulerAngles;
 
@@ -10720,10 +9159,8 @@ public void ToggleColorIntoTypeReceptacleFloors()
 
                         HashSet<float> yOffsets = new HashSet<float>();
                         yOffsets.Add(b.extents.y - 0.01f);
-                        for (int i = -1; i <= 1; i++)
-                        {
-                            for (int j = -1; j <= 1; j++)
-                            {
+                        for (int i = -1; i <= 1; i++) {
+                            for (int j = -1; j <= 1; j++) {
                                 Vector3 start =
                                     b.center
                                     + new Vector3(
@@ -10738,13 +9175,11 @@ RaycastHit hit in Physics.RaycastAll(
                                         10f,
                                         layerMask
                                     )
-                                )
-                                {
+                                ) {
                                     if (
                                         NormalIsApproximatelyUp(hit.normal)
                                         && ancestorSimObjPhysics(hit.transform.gameObject) == so
-                                    )
-                                    {
+                                    ) {
                                         yOffsets.Add(
                                             (float)
                                                 Math.Round(hit.distance - b.extents.y - 0.005f, 3)
@@ -10754,8 +9189,7 @@ RaycastHit hit in Physics.RaycastAll(
                             }
                         }
 
-                        foreach (float yOffset in yOffsets)
-                        {
+                        foreach (float yOffset in yOffsets) {
                             GameObject plane =
                                 Instantiate(
                                     Resources.Load("BluePlane") as GameObject,
diff --git a/unity/Assets/Scripts/PhysicsSceneManager.cs b/unity/Assets/Scripts/PhysicsSceneManager.cs
index c736fd4916..5f90056326 100644
--- a/unity/Assets/Scripts/PhysicsSceneManager.cs
+++ b/unity/Assets/Scripts/PhysicsSceneManager.cs
@@ -10,8 +10,7 @@
 using UnityStandardAssets.ImageEffects;
 
 [ExecuteInEditMode]
-public class PhysicsSimulationParams
-{
+public class PhysicsSimulationParams {
     public bool autoSimulation = false;
     public float fixedDeltaTime = 0.02f;
     public float minSimulateTimeSeconds = 0;
@@ -20,18 +19,14 @@ public class PhysicsSimulationParams
 
     // public int maxActionPhysicsSteps = int.MaxValue;
 
-    public override bool Equals(object p)
-    {
-        if (p is null)
-        {
+    public override bool Equals(object p) {
+        if (p is null) {
             return false;
         }
-        if (object.ReferenceEquals(this, p))
-        {
+        if (object.ReferenceEquals(this, p)) {
             return true;
         }
-        if (this.GetType() != p.GetType())
-        {
+        if (this.GetType() != p.GetType()) {
             return false;
         }
         var otherPhysicsParams = p as PhysicsSimulationParams;
@@ -43,8 +38,7 @@ public override bool Equals(object p)
     }
 }
 
-public class PhysicsSceneManager : MonoBehaviour
-{
+public class PhysicsSceneManager : MonoBehaviour {
     // public static PhysicsSceneManager Instance { get; private set; }
     public bool ProceduralMode = false;
     public List<GameObject> RequiredObjects = new List<GameObject>();
@@ -95,19 +89,16 @@ public class PhysicsSceneManager : MonoBehaviour
 
     public static PhysicsSimulationParams physicsSimulationParams { get; private set; }
 
-    public static float fixedDeltaTime
-    {
+    public static float fixedDeltaTime {
         get { return physicsSimulationParams.fixedDeltaTime; }
         private set { return; }
     }
 
-    void Awake()
-    {
+    void Awake() {
         SetDefaultSimulationParams(new PhysicsSimulationParams());
     }
 
-    private void OnEnable()
-    {
+    private void OnEnable() {
         // must do this here instead of Start() since OnEnable gets triggered prior to Start
         // when the component is enabled.
         agentManager = GameObject
@@ -117,20 +108,17 @@ private void OnEnable()
         // clear this on start so that the CheckForDuplicates function doesn't check pre-existing lists
         SetupScene();
 
-        if (GameObject.Find("HideAndSeek"))
-        {
+        if (GameObject.Find("HideAndSeek")) {
             HideAndSeek = GameObject.Find("HideAndSeek");
         }
 
-        if (!GameObject.Find("Objects"))
-        {
+        if (!GameObject.Find("Objects")) {
             GameObject c = new GameObject("Objects");
             Debug.Log(c.transform.name + " was missing and is now added");
         }
     }
 
-    public void SetupScene(bool generateObjectIds = true)
-    {
+    public void SetupScene(bool generateObjectIds = true) {
         Debug.Log("------- Setup Scene called " + (generateObjectIds && !ProceduralMode));
         ObjectIdToSimObjPhysics.Clear();
         GatherSimObjPhysInScene(generateObjectIds && !ProceduralMode);
@@ -138,28 +126,24 @@ public void SetupScene(bool generateObjectIds = true)
     }
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         PhysicsSceneManager.PhysicsSimulateCallCount = 0;
         GatherAllRBsInScene();
     }
 
     public static void SetDefaultSimulationParams(
         PhysicsSimulationParams defaultPhysicsSimulationParams
-    )
-    {
+    ) {
         PhysicsSceneManager.defaultPhysicsSimulationParams = defaultPhysicsSimulationParams; // ?? new PhysicsSimulationParams();
         PhysicsSceneManager.physicsSimulationParams =
             PhysicsSceneManager.defaultPhysicsSimulationParams;
     }
 
-    public static void SetPhysicsSimulationParams(PhysicsSimulationParams physicsSimulationParams)
-    {
+    public static void SetPhysicsSimulationParams(PhysicsSimulationParams physicsSimulationParams) {
         PhysicsSceneManager.physicsSimulationParams = physicsSimulationParams;
     }
 
-    public static void PhysicsSimulateTHOR(float deltaTime)
-    {
+    public static void PhysicsSimulateTHOR(float deltaTime) {
         Physics.Simulate(deltaTime);
         PhysicsSceneManager.PhysicsSimulateTimeSeconds += deltaTime;
         PhysicsSceneManager.PhysicsSimulateCallCount++;
@@ -168,20 +152,16 @@ public static void PhysicsSimulateTHOR(float deltaTime)
     public static ActionFinished ExpandIEnumerator(
         IEnumerator enumerator,
         PhysicsSimulationParams physicsSimulationParams
-    )
-    {
+    ) {
         ActionFinished actionFinished = null;
 
-        while (enumerator.MoveNext())
-        {
-            if (enumerator.Current == null)
-            {
+        while (enumerator.MoveNext()) {
+            if (enumerator.Current == null) {
                 continue;
             }
 
             // ActionFinished was found but enumerator keeps moving forward, throw error
-            if (actionFinished != null)
-            {
+            if (actionFinished != null) {
                 // Premature ActionFinished, same as yield break, stops iterator evaluation
                 break;
             }
@@ -189,28 +169,22 @@ PhysicsSimulationParams physicsSimulationParams
             if (
                 enumerator.Current.GetType() == typeof(WaitForFixedUpdate)
                 && !physicsSimulationParams.autoSimulation
-            )
-            {
+            ) {
                 // TODO: is this still used?
-                if (physicsSimulationParams.fixedDeltaTime == 0f)
-                {
+                if (physicsSimulationParams.fixedDeltaTime == 0f) {
                     Physics.SyncTransforms();
-                }
-                else
-                {
+                } else {
                     PhysicsSceneManager.PhysicsSimulateTHOR(physicsSimulationParams.fixedDeltaTime);
                 }
             }
             // else if (enumerator.Current.GetType() == typeof)
-            else if (enumerator.Current.GetType() == typeof(ActionFinished))
-            {
+            else if (enumerator.Current.GetType() == typeof(ActionFinished)) {
                 actionFinished = (ActionFinished)(enumerator.Current as ActionFinished);
             }
             // For recursive ienumerators, unity StartCoroutine must do something for cases when (yield return (yield return value))
             // Though C# compiler should handle it and MoveNext should recursively call MoveNext and set Current, but does not seem to work
             // so we manually expand iterators depth first
-            else if (typeof(IEnumerator).IsAssignableFrom(enumerator.Current.GetType()))
-            {
+            else if (typeof(IEnumerator).IsAssignableFrom(enumerator.Current.GetType())) {
                 actionFinished = PhysicsSceneManager.ExpandIEnumerator(
                     enumerator.Current as IEnumerator,
                     physicsSimulationParams
@@ -224,8 +198,7 @@ PhysicsSimulationParams physicsSimulationParams
     public static ActionFinished RunSimulatePhysicsForAction(
         IEnumerator enumerator,
         PhysicsSimulationParams physicsSimulationParams
-    )
-    {
+    ) {
         var fixedDeltaTime = physicsSimulationParams.fixedDeltaTime;
         var previousAutoSimulate = Physics.autoSimulation;
         Physics.autoSimulation = physicsSimulationParams.autoSimulation;
@@ -237,8 +210,7 @@ PhysicsSimulationParams physicsSimulationParams
         // Recursive expansion of IEnumerator
         ActionFinished actionFinished = ExpandIEnumerator(enumerator, physicsSimulationParams);
 
-        if (actionFinished == null)
-        {
+        if (actionFinished == null) {
             throw new MissingActionFinishedException();
         }
 
@@ -248,21 +220,18 @@ PhysicsSimulationParams physicsSimulationParams
         if (
             !physicsSimulationParams.autoSimulation
             && physicsSimulationParams.minSimulateTimeSeconds > 0.0f
-        )
-        {
+        ) {
             // Because of floating point precision
             const float eps = 1e-5f;
             while (
                 PhysicsSceneManager.PhysicsSimulateTimeSeconds
                 <= (physicsSimulationParams.minSimulateTimeSeconds - eps)
-            )
-            {
+            ) {
                 PhysicsSceneManager.PhysicsSimulateTHOR(fixedDeltaTime);
             }
         }
 
-        if (physicsSimulationParams.syncTransformsAfterAction)
-        {
+        if (physicsSimulationParams.syncTransformsAfterAction) {
             Physics.SyncTransforms();
         }
 
@@ -274,28 +243,21 @@ public static IEnumerator RunActionForCoroutine(
         ActionInvokable target,
         IEnumerator action,
         PhysicsSimulationParams physicsSimulationParams
-    )
-    {
+    ) {
         var fixedDeltaTime = physicsSimulationParams.fixedDeltaTime;
         var previousFixedDeltaTime = Time.fixedDeltaTime;
         Time.fixedDeltaTime = fixedDeltaTime;
         var startFixedTimeSeconds = Time.fixedTime;
         ActionFinished actionFinished = null;
 
-        while (true)
-        {
+        while (true) {
             // Adds Exception handling for Coroutines!
-            try
-            {
-                if (!action.MoveNext())
-                {
+            try {
+                if (!action.MoveNext()) {
                     break;
                 }
-            }
-            catch (Exception e)
-            {
-                actionFinished = new ActionFinished()
-                {
+            } catch (Exception e) {
+                actionFinished = new ActionFinished() {
                     success = false,
                     errorMessage = $"{e.GetType()}: {e.StackTrace}",
                     errorCode = ServerActionErrorCode.UnhandledException
@@ -310,8 +272,7 @@ PhysicsSimulationParams physicsSimulationParams
                 break;
             }
 
-            if (action.Current != null && typeof(ActionFinished) == action.Current.GetType())
-            {
+            if (action.Current != null && typeof(ActionFinished) == action.Current.GetType()) {
                 actionFinished = (ActionFinished)(action.Current as ActionFinished);
                 break;
             }
@@ -324,8 +285,7 @@ PhysicsSimulationParams physicsSimulationParams
         //     throw new MissingActionFinishedException();
         // }
 
-        actionFinished ??= new ActionFinished()
-        {
+        actionFinished ??= new ActionFinished() {
             success = false,
             errorMessage = "Action did not return an `ActionFinished`.",
             errorCode = ServerActionErrorCode.MissingActionFinished
@@ -334,14 +294,12 @@ PhysicsSimulationParams physicsSimulationParams
         var actionFixedTime = Time.fixedTime - startFixedTimeSeconds;
         const float eps = 1e-5f;
 
-        while (actionFixedTime <= (physicsSimulationParams.minSimulateTimeSeconds - eps))
-        {
+        while (actionFixedTime <= (physicsSimulationParams.minSimulateTimeSeconds - eps)) {
             yield return new WaitForFixedUpdate();
             actionFixedTime += fixedDeltaTime;
         }
 
-        if (physicsSimulationParams.syncTransformsAfterAction)
-        {
+        if (physicsSimulationParams.syncTransformsAfterAction) {
             Physics.SyncTransforms();
         }
 
@@ -353,38 +311,31 @@ PhysicsSimulationParams physicsSimulationParams
     // Returns previous parameters
     public static PhysicsSimulationParams applyPhysicsSimulationParams(
         PhysicsSimulationParams physicsSimulationParams
-    )
-    {
-        return new PhysicsSimulationParams()
-        {
+    ) {
+        return new PhysicsSimulationParams() {
             autoSimulation = Physics.autoSimulation,
             fixedDeltaTime = Time.fixedDeltaTime
         };
     }
 
-    private void GatherAllRBsInScene()
-    {
+    private void GatherAllRBsInScene() {
         // cache all rigidbodies that are in the scene by default
         // NOTE: any rigidbodies created from actions such as Slice/Break or spawned in should be added to this!
         rbsInScene = new HashSet<Rigidbody>(FindObjectsOfType<Rigidbody>());
     }
 
     // disabling LateUpdate to experiment with determinism
-    void LateUpdate()
-    {
+    void LateUpdate() {
         // check what objects in the scene are currently in motion
         // Rigidbody[] rbs = FindObjectsOfType(typeof(Rigidbody)) as Rigidbody[];
-        foreach (Rigidbody rb in rbsInScene)
-        {
-            if (rb == null)
-            {
+        foreach (Rigidbody rb in rbsInScene) {
+            if (rb == null) {
                 return;
             }
 
             // if this rigidbody is part of a SimObject, calculate rest using lastVelocity/currentVelocity comparisons
             // make sure the object is actually active, otherwise skip the check
-            if (rb.GetComponentInParent<SimObjPhysics>() && rb.transform.gameObject.activeSelf)
-            {
+            if (rb.GetComponentInParent<SimObjPhysics>() && rb.transform.gameObject.activeSelf) {
                 SimObjPhysics sop = rb.GetComponentInParent<SimObjPhysics>();
 
                 float currentVelocity = Math.Abs(
@@ -392,14 +343,11 @@ void LateUpdate()
                 );
                 float accel = (currentVelocity - sop.lastVelocity) / Time.fixedDeltaTime;
 
-                if (Mathf.Abs(accel) <= 0.0001f)
-                {
+                if (Mathf.Abs(accel) <= 0.0001f) {
                     sop.inMotion = false;
                     // print(sop.transform.name + " should be sleeping");
                     // rb.Sleep(); maybe do something to ensure object has stopped moving, and reduce jitter
-                }
-                else
-                {
+                } else {
                     // the rb's velocities are not 0, so it is in motion and the scene is not at rest
                     rb.GetComponentInParent<SimObjPhysics>().inMotion = true;
                     isSceneAtRest = false;
@@ -408,17 +356,13 @@ void LateUpdate()
                     // #endif
                 }
                 // only apply drag if autosimulation is on
-            }
-            else if (Physics.autoSimulation)
-            {
+            } else if (Physics.autoSimulation) {
                 // this rigidbody is not a SimOBject, and might be a piece of a shattered sim object spawned in, or something
-                if (rb.transform.gameObject.activeSelf)
-                {
+                if (rb.transform.gameObject.activeSelf) {
                     // is the rigidbody at non zero velocity? then the scene is not at rest
                     if (
                         Math.Abs(rb.angularVelocity.sqrMagnitude + rb.velocity.sqrMagnitude) >= 0.01
-                    )
-                    {
+                    ) {
                         isSceneAtRest = false;
                         // make sure the rb's drag values are not at 0 exactly
                         // if (rb.drag < 0.1f)
@@ -431,17 +375,14 @@ void LateUpdate()
 #if UNITY_EDITOR
                         //print(rb.transform.name + " is still in motion!");
 #endif
-                    }
-                    else
-                    {
+                    } else {
                         // the velocities are small enough, assume object has come to rest and force this one to sleep
                         rb.drag = 1.0f;
                         rb.angularDrag = 1.0f;
                     }
 
                     // if the shard/broken piece gets out of bounds somehow and begins falling forever, get rid of it with this check
-                    if (rb.transform.position.y < -50f)
-                    {
+                    if (rb.transform.position.y < -50f) {
                         rb.transform.gameObject.SetActive(false);
                         // note: we might want to remove these from the list of rbs at some point but for now it'll be fine
                     }
@@ -451,22 +392,17 @@ void LateUpdate()
     }
 
     // used to add a reference to a rigidbody created after the scene was started
-    public void AddToRBSInScene(Rigidbody rb)
-    {
+    public void AddToRBSInScene(Rigidbody rb) {
         rbsInScene.Add(rb);
     }
 
-    public void RemoveFromRBSInScene(Rigidbody rb)
-    {
+    public void RemoveFromRBSInScene(Rigidbody rb) {
         rbsInScene.Remove(rb);
     }
 
-    public bool ToggleHideAndSeek(bool hide)
-    {
-        if (HideAndSeek)
-        {
-            if (HideAndSeek.activeSelf != hide)
-            {
+    public bool ToggleHideAndSeek(bool hide) {
+        if (HideAndSeek) {
+            if (HideAndSeek.activeSelf != hide) {
                 HideAndSeek.SetActive(hide);
                 SetupScene();
             }
@@ -479,29 +415,23 @@ public bool ToggleHideAndSeek(bool hide)
         return false;
     }
 
-    public void ResetObjectIdToSimObjPhysics()
-    {
+    public void ResetObjectIdToSimObjPhysics() {
         ObjectIdToSimObjPhysics.Clear();
-        foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>())
-        {
+        foreach (SimObjPhysics so in GameObject.FindObjectsOfType<SimObjPhysics>()) {
             ObjectIdToSimObjPhysics[so.ObjectID] = so;
         }
     }
 
-    public void MakeAllObjectsMoveable()
-    {
-        foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>())
-        {
+    public void MakeAllObjectsMoveable() {
+        foreach (SimObjPhysics sop in GameObject.FindObjectsOfType<SimObjPhysics>()) {
             // check if the sopType is something that can be hung
             if (
                 sop.Type == SimObjType.Towel
                 || sop.Type == SimObjType.HandTowel
                 || sop.Type == SimObjType.ToiletPaper
-            )
-            {
+            ) {
                 // if this object is actively hung on its corresponding object specific receptacle... skip it so it doesn't fall on the floor
-                if (sop.GetComponentInParent<ObjectSpecificReceptacle>())
-                {
+                if (sop.GetComponentInParent<ObjectSpecificReceptacle>()) {
                     continue;
                 }
             }
@@ -509,8 +439,7 @@ public void MakeAllObjectsMoveable()
             if (
                 sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup
                 || sop.PrimaryProperty == SimObjPrimaryProperty.Moveable
-            )
-            {
+            ) {
                 Rigidbody rb = sop.GetComponent<Rigidbody>();
                 rb.isKinematic = false;
                 rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
@@ -518,33 +447,27 @@ public void MakeAllObjectsMoveable()
         }
     }
 
-    public void GatherSimObjPhysInScene(bool generateObjectIds = true)
-    {
+    public void GatherSimObjPhysInScene(bool generateObjectIds = true) {
         List<SimObjPhysics> allPhysObjects = new List<SimObjPhysics>();
 
         allPhysObjects.AddRange(FindObjectsOfType<SimObjPhysics>());
         allPhysObjects.Sort((x, y) => (x.Type.ToString().CompareTo(y.Type.ToString())));
 
-        foreach (SimObjPhysics o in allPhysObjects)
-        {
-            if (generateObjectIds)
-            {
+        foreach (SimObjPhysics o in allPhysObjects) {
+            if (generateObjectIds) {
                 Generate_ObjectID(o);
             }
 
             // debug in editor, make sure no two object share ids for some reason
 #if UNITY_EDITOR
-            if (CheckForDuplicateObjectIDs(o))
-            {
+            if (CheckForDuplicateObjectIDs(o)) {
                 Debug.Log(
                     "Yo there are duplicate ObjectIDs! Check"
                         + o.ObjectID
                         + "in scene "
                         + UnityEngine.SceneManagement.SceneManager.GetActiveScene().name
                 );
-            }
-            else
-            {
+            } else {
                 AddToObjectsInScene(o);
                 continue;
             }
@@ -553,31 +476,24 @@ public void GatherSimObjPhysInScene(bool generateObjectIds = true)
             AddToObjectsInScene(o);
         }
 
-        foreach (var agent in this.agentManager.agents)
-        {
-            if (agent.imageSynthesis != null)
-            {
+        foreach (var agent in this.agentManager.agents) {
+            if (agent.imageSynthesis != null) {
                 agent.imageSynthesis.OnSceneChange();
             }
         }
     }
 
-    public List<SimObjPhysics> GatherAllReceptaclesInScene()
-    {
+    public List<SimObjPhysics> GatherAllReceptaclesInScene() {
         List<SimObjPhysics> ReceptaclesInScene = new List<SimObjPhysics>();
 
-        foreach (SimObjPhysics sop in ObjectIdToSimObjPhysics.Values)
-        {
-            if (sop.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-            {
+        foreach (SimObjPhysics sop in ObjectIdToSimObjPhysics.Values) {
+            if (sop.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
                 ReceptaclesInScene.Add(sop);
 
 #if UNITY_EDITOR
                 // debug if some of these receptacles were not set up correctly
-                foreach (GameObject go in sop.ReceptacleTriggerBoxes)
-                {
-                    if (go == null)
-                    {
+                foreach (GameObject go in sop.ReceptacleTriggerBoxes) {
+                    if (go == null) {
                         Debug.LogWarning(
                             sop.gameObject
                                 + " has non-empty receptacle trigger boxes but contains a null value."
@@ -588,16 +504,14 @@ public List<SimObjPhysics> GatherAllReceptaclesInScene()
                     // c.CurrentlyContainedObjects().Clear();
                     // c.GetComponent<Collider>().enabled = false;
                     // c.GetComponent<Collider>().enabled = true;
-                    if (c == null)
-                    {
+                    if (c == null) {
                         Debug.LogWarning(
                             sop.gameObject
                                 + " is missing a contains script on one of its receptacle boxes."
                         );
                         continue;
                     }
-                    if (go.GetComponent<Contains>().myParent == null)
-                    {
+                    if (go.GetComponent<Contains>().myParent == null) {
                         go.GetComponent<Contains>().myParent = sop.transform.gameObject;
                     }
                 }
@@ -611,14 +525,11 @@ public List<SimObjPhysics> GatherAllReceptaclesInScene()
         return ReceptaclesInScene;
     }
 
-    public void Generate_ObjectID(SimObjPhysics o)
-    {
+    public void Generate_ObjectID(SimObjPhysics o) {
         // check if this object requires it's parent simObjs ObjectID as a prefix
-        if (ReceptacleRestrictions.UseParentObjectIDasPrefix.Contains(o.Type))
-        {
+        if (ReceptacleRestrictions.UseParentObjectIDasPrefix.Contains(o.Type)) {
             SimObjPhysics parent = o.transform.parent.GetComponent<SimObjPhysics>();
-            if (parent == null)
-            {
+            if (parent == null) {
                 Debug.LogWarning(
                     "Object "
                         + o
@@ -629,8 +540,7 @@ public void Generate_ObjectID(SimObjPhysics o)
                 return;
             }
 
-            if (parent.ObjectID == null)
-            {
+            if (parent.ObjectID == null) {
                 Vector3 ppos = parent.transform.position;
                 string xpPos = (ppos.x >= 0 ? "+" : "") + ppos.x.ToString("00.00");
                 string ypPos = (ppos.y >= 0 ? "+" : "") + ppos.y.ToString("00.00");
@@ -654,47 +564,38 @@ public void Generate_InheritedObjectID(
         SimObjPhysics sourceObject,
         SimObjPhysics createdObject,
         int count
-    )
-    {
+    ) {
         createdObject.ObjectID = sourceObject.ObjectID + "|" + createdObject.ObjType + "_" + count;
         AddToObjectsInScene(createdObject);
     }
 
-    private bool CheckForDuplicateObjectIDs(SimObjPhysics sop)
-    {
+    private bool CheckForDuplicateObjectIDs(SimObjPhysics sop) {
         return ObjectIdToSimObjPhysics.ContainsKey(sop.ObjectID);
     }
 
-    public void AddToObjectsInScene(SimObjPhysics sop)
-    {
+    public void AddToObjectsInScene(SimObjPhysics sop) {
         ObjectIdToSimObjPhysics[sop.ObjectID] = sop;
-        if (sop.GetComponent<Rigidbody>())
-        {
+        if (sop.GetComponent<Rigidbody>()) {
             Rigidbody rb = sop.GetComponent<Rigidbody>();
             AddToRBSInScene(rb);
         }
     }
 
-    public void RemoveFromObjectsInScene(SimObjPhysics sop)
-    {
-        if (ObjectIdToSimObjPhysics.ContainsKey(sop.ObjectID))
-        {
+    public void RemoveFromObjectsInScene(SimObjPhysics sop) {
+        if (ObjectIdToSimObjPhysics.ContainsKey(sop.ObjectID)) {
             ObjectIdToSimObjPhysics.Remove(sop.ObjectID);
-            if (sop.GetComponent<Rigidbody>())
-            {
+            if (sop.GetComponent<Rigidbody>()) {
                 Rigidbody rb = sop.GetComponent<Rigidbody>();
                 RemoveFromRBSInScene(rb);
             }
         }
     }
 
-    public void RemoveFromSpawnedObjects(SimObjPhysics sop)
-    {
+    public void RemoveFromSpawnedObjects(SimObjPhysics sop) {
         SpawnedObjects.Remove(sop.gameObject);
     }
 
-    public void RemoveFromRequiredObjects(SimObjPhysics sop)
-    {
+    public void RemoveFromRequiredObjects(SimObjPhysics sop) {
         RequiredObjects.Remove(sop.gameObject);
     }
 
@@ -702,14 +603,12 @@ public bool SetObjectPoses(
         ObjectPose[] objectPoses,
         out string errorMessage,
         bool placeStationary
-    )
-    {
+    ) {
         SetupScene();
         errorMessage = "";
         bool shouldFail = false;
         GameObject topObject = GameObject.Find("Objects");
-        if (objectPoses != null && objectPoses.Length > 0)
-        {
+        if (objectPoses != null && objectPoses.Length > 0) {
             // Perform object location sets
             SimObjPhysics[] sceneObjects = FindObjectsOfType<SimObjPhysics>();
 
@@ -720,30 +619,25 @@ bool placeStationary
                 new Dictionary<string, SimObjPhysics>();
 
             // get all sim objects in scene that are either pickupable or moveable and prepare them to be repositioned, cloned, or disabled
-            foreach (SimObjPhysics sop in sceneObjects)
-            {
+            foreach (SimObjPhysics sop in sceneObjects) {
                 // note that any moveable or pickupable sim objects not explicitly passed in via objectPoses
                 // will be disabled since we SetActive(false)
-                if (sop.IsPickupable || sop.IsMoveable)
-                {
+                if (sop.IsPickupable || sop.IsMoveable) {
                     sop.gameObject.SetActive(false);
                     // sop.gameObject.GetComponent<SimpleSimObj>().IsDisabled = true;
                     nameToObject[sop.name] = sop;
                 }
 
                 // track all static sim objects as well for reference later
-                if (sop.isStatic)
-                {
+                if (sop.isStatic) {
                     isStaticNameToObject[sop.name] = sop;
                 }
             }
             HashSet<SimObjPhysics> placedOriginal = new HashSet<SimObjPhysics>();
-            for (int ii = 0; ii < objectPoses.Length; ii++)
-            {
+            for (int ii = 0; ii < objectPoses.Length; ii++) {
                 ObjectPose objectPose = objectPoses[ii];
 
-                if (!nameToObject.ContainsKey(objectPose.objectName))
-                {
+                if (!nameToObject.ContainsKey(objectPose.objectName)) {
                     errorMessage =
                         "No Pickupable or Moveable object of name "
                         + objectPose.objectName
@@ -752,8 +646,7 @@ bool placeStationary
                     shouldFail = true;
                     continue;
                 }
-                if (isStaticNameToObject.ContainsKey(objectPose.objectName))
-                {
+                if (isStaticNameToObject.ContainsKey(objectPose.objectName)) {
                     errorMessage =
                         objectPose.objectName
                         + " is not a Moveable or Pickupable object. SetObjectPoses only works with Moveable and Pickupable sim objects.";
@@ -764,8 +657,7 @@ bool placeStationary
                 if (
                     !nameToObject.ContainsKey(objectPose.objectName)
                     && !isStaticNameToObject.ContainsKey(objectPose.objectName)
-                )
-                {
+                ) {
                     errorMessage = objectPose.objectName + " does not exist in scene.";
                     shouldFail = true;
                     continue;
@@ -774,16 +666,13 @@ bool placeStationary
                 SimObjPhysics obj = nameToObject[objectPose.objectName];
                 SimObjPhysics existingSOP = obj.GetComponent<SimObjPhysics>();
                 SimObjPhysics copy;
-                if (placedOriginal.Contains(existingSOP))
-                {
+                if (placedOriginal.Contains(existingSOP)) {
                     copy = Instantiate(original: existingSOP);
                     copy.transform.parent = GameObject.Find("Objects").transform;
                     copy.name += "_copy_" + ii;
                     copy.ObjectID = existingSOP.ObjectID + "_copy_" + ii;
                     copy.objectID = copy.ObjectID;
-                }
-                else
-                {
+                } else {
                     copy = existingSOP;
                     placedOriginal.Add(existingSOP);
                 }
@@ -793,14 +682,11 @@ bool placeStationary
                 copy.gameObject.SetActive(true);
                 copy.gameObject.transform.parent = topObject.transform;
 
-                if (placeStationary)
-                {
+                if (placeStationary) {
                     copy.GetComponent<Rigidbody>().collisionDetectionMode =
                         CollisionDetectionMode.Discrete;
                     copy.GetComponent<Rigidbody>().isKinematic = true;
-                }
-                else
-                {
+                } else {
                     copy.GetComponent<Rigidbody>().isKinematic = false;
                 }
             }
@@ -812,34 +698,27 @@ bool placeStationary
     public System.Collections.Generic.IEnumerator<SimObjPhysics> GetValidReceptaclesForSimObj(
         SimObjPhysics simObj,
         List<SimObjPhysics> receptaclesInScene
-    )
-    {
+    ) {
         SimObjType goObjType = simObj.ObjType;
         bool typeFoundInDictionary = ReceptacleRestrictions.PlacementRestrictions.ContainsKey(
             goObjType
         );
-        if (typeFoundInDictionary)
-        {
+        if (typeFoundInDictionary) {
             List<SimObjType> typesOfObjectsPrefabIsAllowedToSpawnIn = new List<SimObjType>(
                 ReceptacleRestrictions.PlacementRestrictions[goObjType]
             );
 
             // remove from list if receptacle isn't in this scene
             // compare to receptacles that exist in scene, get the ones that are the same
-            foreach (SimObjPhysics receptacleSop in receptaclesInScene)
-            {
+            foreach (SimObjPhysics receptacleSop in receptaclesInScene) {
                 // don't random spawn in objects that are pickupable to prevent Egg spawning in Plate with the plate spawned in Cabinet....
-                if (receptacleSop.PrimaryProperty != SimObjPrimaryProperty.CanPickup)
-                {
-                    if (typesOfObjectsPrefabIsAllowedToSpawnIn.Contains(receptacleSop.ObjType))
-                    {
+                if (receptacleSop.PrimaryProperty != SimObjPrimaryProperty.CanPickup) {
+                    if (typesOfObjectsPrefabIsAllowedToSpawnIn.Contains(receptacleSop.ObjType)) {
                         yield return receptacleSop;
                     }
                 }
             }
-        }
-        else
-        {
+        } else {
             // not found in dictionary!
 #if UNITY_EDITOR
             Debug.Log(simObj.ObjectID + "'s Type is not in the ReceptacleRestrictions dictionary!");
@@ -865,8 +744,7 @@ public bool RandomSpawnRequiredSceneObjects(
         String[] receptacleObjectIds,
         String[] objectIds,
         bool allowMoveable
-    )
-    {
+    ) {
 #if UNITY_EDITOR
         var Masterwatch = System.Diagnostics.Stopwatch.StartNew();
 #endif
@@ -875,10 +753,8 @@ bool allowMoveable
         //sim objects in the scene at runtime to try and reposition
         SimObjPhysics[] simObjsInScene = GameObject.FindObjectsOfType<SimObjPhysics>();
         List<GameObject> simObjsInSceneToGameObjectList = new List<GameObject>();
-        foreach (SimObjPhysics sop in simObjsInScene)
-        {
-            if (allowMoveable && sop.IsMoveable || sop.IsPickupable)
-            {
+        foreach (SimObjPhysics sop in simObjsInScene) {
+            if (allowMoveable && sop.IsMoveable || sop.IsPickupable) {
                 simObjsInSceneToGameObjectList.Add(sop.gameObject);
             }
         }
@@ -887,8 +763,7 @@ bool allowMoveable
         RequiredObjects = simObjsInSceneToGameObjectList;
         SpawnedObjects = simObjsInSceneToGameObjectList;
 
-        if (RequiredObjects.Count == 0)
-        {
+        if (RequiredObjects.Count == 0) {
 #if UNITY_EDITOR
             Debug.Log("No objects in Required Objects array, please add them in editor");
 #endif
@@ -904,8 +779,7 @@ bool allowMoveable
         int HowManyCouldntSpawn = RequiredObjects.Count;
 
         // if we already spawned objects, lets just move them around
-        if (SpawnedObjects.Count > 0)
-        {
+        if (SpawnedObjects.Count > 0) {
             HowManyCouldntSpawn = SpawnedObjects.Count;
 
             Dictionary<SimObjType, List<SimObjPhysics>> typeToObjectList =
@@ -916,27 +790,23 @@ bool allowMoveable
             // List<SimObjType> listOfExcludedReceptacles = new List<SimObjType>();
             HashSet<GameObject> originalObjects = new HashSet<GameObject>(SpawnedObjects);
 
-            if (numDuplicatesOfType == null)
-            {
+            if (numDuplicatesOfType == null) {
                 numDuplicatesOfType = new ObjectTypeCount[0];
             }
 
-            foreach (ObjectTypeCount repeatCount in numDuplicatesOfType)
-            {
+            foreach (ObjectTypeCount repeatCount in numDuplicatesOfType) {
                 SimObjType objType = (SimObjType)
                     System.Enum.Parse(typeof(SimObjType), repeatCount.objectType);
                 requestedNumDuplicatesOfType[objType] = repeatCount.count;
             }
 
             // Now lets go through all pickupable sim objects that are in the current scene
-            foreach (GameObject go in SpawnedObjects)
-            {
+            foreach (GameObject go in SpawnedObjects) {
                 SimObjPhysics sop = null;
                 sop = go.GetComponent<SimObjPhysics>();
 
                 // Add object types in the current scene to the typeToObjectList if not already on it
-                if (!typeToObjectList.ContainsKey(sop.ObjType))
-                {
+                if (!typeToObjectList.ContainsKey(sop.ObjType)) {
                     typeToObjectList[sop.ObjType] = new List<SimObjPhysics>();
                 }
 
@@ -947,8 +817,7 @@ bool allowMoveable
                         typeToObjectList[sop.ObjType].Count
                         < requestedNumDuplicatesOfType[sop.ObjType]
                     )
-                )
-                {
+                ) {
                     typeToObjectList[sop.ObjType].Add(sop);
                 }
             }
@@ -960,17 +829,14 @@ bool allowMoveable
             List<GameObject> unduplicatedSimObjects = new List<GameObject>();
 
             // Ok now lets go through each object type in the dictionary
-            foreach (SimObjType sopType in typeToObjectList.Keys)
-            {
+            foreach (SimObjType sopType in typeToObjectList.Keys) {
                 // we found a matching SimObjType and the requested count of duplicates is bigger than how many of that
                 // object are currently in the scene
                 if (
                     requestedNumDuplicatesOfType.ContainsKey(sopType)
                     && requestedNumDuplicatesOfType[sopType] > typeToObjectList[sopType].Count
-                )
-                {
-                    foreach (SimObjPhysics sop in typeToObjectList[sopType])
-                    {
+                ) {
+                    foreach (SimObjPhysics sop in typeToObjectList[sopType]) {
                         gameObjsToPlaceInReceptacles.Add(sop.gameObject);
                     }
 
@@ -978,8 +844,7 @@ bool allowMoveable
                         requestedNumDuplicatesOfType[sopType] - typeToObjectList[sopType].Count;
 
                     // let's instantiate the duplicates now
-                    for (int j = 0; j < numExtra; j++)
-                    {
+                    for (int j = 0; j < numExtra; j++) {
                         // Add a copy of the item to try and match the requested number of duplicates
                         SimObjPhysics sop = typeToObjectList[sopType][
                             UnityEngine.Random.Range(0, typeToObjectList[sopType].Count - 1)
@@ -991,12 +856,9 @@ bool allowMoveable
                         copy.objectID = copy.ObjectID;
                         gameObjsToPlaceInReceptacles.Add(copy.gameObject);
                     }
-                }
-                else
-                {
+                } else {
                     // this object is not one that needs duplicates, so just add it to the unduplicatedSimObjects list
-                    foreach (SimObjPhysics sop in typeToObjectList[sopType])
-                    {
+                    foreach (SimObjPhysics sop in typeToObjectList[sopType]) {
                         unduplicatedSimObjects.Add(sop.gameObject);
                     }
                 }
@@ -1010,8 +872,7 @@ bool allowMoveable
 
             Dictionary<SimObjType, List<SimObjPhysics>> objTypeToReceptacles =
                 new Dictionary<SimObjType, List<SimObjPhysics>>();
-            foreach (SimObjPhysics receptacleSop in GatherAllReceptaclesInScene())
-            {
+            foreach (SimObjPhysics receptacleSop in GatherAllReceptaclesInScene()) {
                 SimObjType receptType = receptacleSop.ObjType;
                 if (
                     (
@@ -1025,10 +886,8 @@ bool allowMoveable
                             receptacleSop.ObjType
                         )
                     )
-                )
-                {
-                    if (!objTypeToReceptacles.ContainsKey(receptacleSop.ObjType))
-                    {
+                ) {
+                    if (!objTypeToReceptacles.ContainsKey(receptacleSop.ObjType)) {
                         objTypeToReceptacles[receptacleSop.ObjType] = new List<SimObjPhysics>();
                     }
                     objTypeToReceptacles[receptacleSop.ObjType].Add(receptacleSop);
@@ -1036,13 +895,11 @@ bool allowMoveable
             }
 
             InstantiatePrefabTest spawner = gameObject.GetComponent<InstantiatePrefabTest>();
-            foreach (GameObject gameObjToPlaceInReceptacle in gameObjsToPlaceInReceptacles)
-            {
+            foreach (GameObject gameObjToPlaceInReceptacle in gameObjsToPlaceInReceptacles) {
                 SimObjPhysics sopToPlaceInReceptacle =
                     gameObjToPlaceInReceptacle.GetComponent<SimObjPhysics>();
 
-                if (staticPlacement)
-                {
+                if (staticPlacement) {
                     sopToPlaceInReceptacle.GetComponent<Rigidbody>().isKinematic = true;
                 }
 
@@ -1053,8 +910,7 @@ bool allowMoveable
                 if (
                     (objectIds != null && !objectIds.Contains(sopToPlaceInReceptacle.ObjectID))
                     || excludedSimObjects.Contains(sopToPlaceInReceptacle)
-                )
-                {
+                ) {
                     HowManyCouldntSpawn--;
                     continue;
                 }
@@ -1065,15 +921,13 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
                         objTypeToReceptacles,
                         rng
                     )
-                )
-                {
+                ) {
                     List<ReceptacleSpawnPoint> targetReceptacleSpawnPoints;
 
                     if (
                         receptacleSop.ContainedGameObjects().Count > 0
                         && receptacleSop.IsPickupable
-                    )
-                    {
+                    ) {
                         //this pickupable object already has something in it, skip over it since we currently can't account for detecting bounds of a receptacle + any contained objects
                         continue;
                     }
@@ -1085,18 +939,15 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
                         receptacleSop.DoesThisObjectHaveThisSecondaryProperty(
                             SimObjSecondaryProperty.ObjectSpecificReceptacle
                         )
-                    )
-                    {
+                    ) {
                         ObjectSpecificReceptacle osr =
                             receptacleSop.GetComponent<ObjectSpecificReceptacle>();
 
-                        if (osr.HasSpecificType(sopToPlaceInReceptacle.ObjType))
-                        {
+                        if (osr.HasSpecificType(sopToPlaceInReceptacle.ObjType)) {
                             // in the random spawn function, we need this additional check because there isn't a chance for
                             // the physics update loop to fully update osr.isFull() correctly, which can cause multiple objects
                             // to be placed on the same spot (ie: 2 pots on the same burner)
-                            if (osr.attachPoint.transform.childCount > 0)
-                            {
+                            if (osr.attachPoint.transform.childCount > 0) {
                                 break;
                             }
 
@@ -1104,8 +955,7 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
                             if (
                                 receptacleSop.GetComponent<SimObjPhysics>().Type
                                 == SimObjType.StoveBurner
-                            )
-                            {
+                            ) {
                                 if (
                                     StoveTopCheckSpawnArea(
                                         sopToPlaceInReceptacle,
@@ -1113,8 +963,7 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
                                         osr.attachPoint.transform.rotation,
                                         false
                                     ) == true
-                                )
-                                {
+                                ) {
                                     // print("moving object now");
                                     gameObjToPlaceInReceptacle.transform.position =
                                         osr.attachPoint.position;
@@ -1136,9 +985,7 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
 
                                     break;
                                 }
-                            }
-                            else
-                            { // for everything else (coffee maker, toilet paper holder, etc) just place it if there is nothing attached
+                            } else { // for everything else (coffee maker, toilet paper holder, etc) just place it if there is nothing attached
                                 gameObjToPlaceInReceptacle.transform.position =
                                     osr.attachPoint.position;
                                 gameObjToPlaceInReceptacle.transform.SetParent(
@@ -1171,37 +1018,31 @@ SimObjPhysics receptacleSop in IterShuffleSimObjPhysicsDictList(
                             90,
                             true
                         )
-                    )
-                    {
+                    ) {
                         HowManyCouldntSpawn--;
                         spawned = true;
                         break;
                     }
                 }
 
-                if (!spawned)
-                {
+                if (!spawned) {
 #if UNITY_EDITOR
                     Debug.Log(gameObjToPlaceInReceptacle.name + " could not be spawned.");
 #endif
                     // go.GetComponent<SimpleSimObj>().IsDisabled = true;
-                    if (!originalObjects.Contains(gameObjToPlaceInReceptacle))
-                    {
+                    if (!originalObjects.Contains(gameObjToPlaceInReceptacle)) {
                         gameObjToPlaceInReceptacle.SetActive(false);
                         Destroy(gameObjToPlaceInReceptacle);
                     }
                 }
             }
-        }
-        else
-        {
+        } else {
             /// XXX: add exception in at some point
             throw new NotImplementedException();
         }
 
 #if UNITY_EDITOR
-        if (HowManyCouldntSpawn > 0)
-        {
+        if (HowManyCouldntSpawn > 0) {
             Debug.Log(HowManyCouldntSpawn + " object(s) could not be spawned into the scene!");
         }
 
@@ -1222,15 +1063,13 @@ public bool StoveTopCheckSpawnArea(
         Vector3 position,
         Quaternion rotation,
         bool spawningInHand
-    )
-    {
+    ) {
         int layermask;
 
         // first do a check to see if the area is clear
 
         // if spawning in the agent's hand, ignore collisions with the Agent
-        if (spawningInHand)
-        {
+        if (spawningInHand) {
             layermask = LayerMask.GetMask(
                 "SimObjVisible",
                 "Procedural1",
@@ -1238,9 +1077,7 @@ bool spawningInHand
                 "Procedural3",
                 "Procedural0"
             );
-        }
-        else
-        {
+        } else {
             // oh we are spawning it somwhere in the environment,
             // we do need to make sure not to spawn inside the agent or the environment
             layermask = LayerMask.GetMask(
@@ -1257,10 +1094,8 @@ bool spawningInHand
         // laptops which have multiple sets of colliders, with one part moving...
         Collider[] objcols = simObj.transform.GetComponentsInChildren<Collider>();
 
-        foreach (Collider col in objcols)
-        {
-            if (col.gameObject.name != "BoundingBox")
-            {
+        foreach (Collider col in objcols) {
+            if (col.gameObject.name != "BoundingBox") {
                 col.enabled = false;
             }
         }
@@ -1298,27 +1133,21 @@ bool spawningInHand
         // now check if any of the hit colliders were any object EXCEPT other stove top objects i guess
         bool result = true;
 
-        if (hitColliders.Length > 0)
-        {
-            foreach (Collider col in hitColliders)
-            {
+        if (hitColliders.Length > 0) {
+            foreach (Collider col in hitColliders) {
                 // if we hit some structure object like a stove top or countertop mesh, ignore it since we are snapping this to a specific position right here
-                if (!col.GetComponentInParent<SimObjPhysics>())
-                {
+                if (!col.GetComponentInParent<SimObjPhysics>()) {
                     break;
                 }
 
                 // if any sim object is hit that is not a stove burner, then ABORT
-                if (col.GetComponentInParent<SimObjPhysics>().Type != SimObjType.StoveBurner)
-                {
+                if (col.GetComponentInParent<SimObjPhysics>().Type != SimObjType.StoveBurner) {
                     result = false;
                     simObj.transform.position = originalPos;
                     simObj.transform.rotation = originalRot;
 
-                    foreach (Collider yes in objcols)
-                    {
-                        if (yes.gameObject.name != "BoundingBox")
-                        {
+                    foreach (Collider yes in objcols) {
+                        if (yes.gameObject.name != "BoundingBox") {
                             yes.enabled = true;
                         }
                     }
@@ -1328,10 +1157,8 @@ bool spawningInHand
         }
 
         // nothing hit in colliders, so we are good to spawn.
-        foreach (Collider col in objcols)
-        {
-            if (col.gameObject.name != "BoundingBox")
-            {
+        foreach (Collider col in objcols) {
+            if (col.gameObject.name != "BoundingBox") {
                 col.enabled = true;
             }
         }
@@ -1344,32 +1171,26 @@ bool spawningInHand
     public List<SimObjPhysics> ShuffleSimObjPhysicsDictList(
         Dictionary<SimObjType, List<SimObjPhysics>> dict,
         int seed
-    )
-    {
+    ) {
         List<SimObjType> types = new List<SimObjType>();
         Dictionary<SimObjType, int> indDict = new Dictionary<SimObjType, int>();
-        foreach (KeyValuePair<SimObjType, List<SimObjPhysics>> pair in dict)
-        {
+        foreach (KeyValuePair<SimObjType, List<SimObjPhysics>> pair in dict) {
             types.Add(pair.Key);
             indDict[pair.Key] = pair.Value.Count - 1;
         }
         types.Sort();
         types.Shuffle_(seed);
-        foreach (SimObjType t in types)
-        {
+        foreach (SimObjType t in types) {
             dict[t].Shuffle_(seed);
         }
 
         bool changed = true;
         List<SimObjPhysics> shuffledSopList = new List<SimObjPhysics>();
-        while (changed)
-        {
+        while (changed) {
             changed = false;
-            foreach (SimObjType type in types)
-            {
+            foreach (SimObjType type in types) {
                 int i = indDict[type];
-                if (i >= 0)
-                {
+                if (i >= 0) {
                     changed = true;
                     shuffledSopList.Add(dict[type][i]);
                     indDict[type]--;
@@ -1382,32 +1203,26 @@ int seed
     public IEnumerable<SimObjPhysics> IterShuffleSimObjPhysicsDictList(
         Dictionary<SimObjType, List<SimObjPhysics>> dict,
         System.Random rng
-    )
-    {
+    ) {
         List<SimObjType> types = new List<SimObjType>();
         Dictionary<SimObjType, int> indDict = new Dictionary<SimObjType, int>();
-        foreach (KeyValuePair<SimObjType, List<SimObjPhysics>> pair in dict)
-        {
+        foreach (KeyValuePair<SimObjType, List<SimObjPhysics>> pair in dict) {
             types.Add(pair.Key);
             indDict[pair.Key] = pair.Value.Count - 1;
         }
         types.Sort();
         types.Shuffle_(rng);
-        foreach (SimObjType t in types)
-        {
+        foreach (SimObjType t in types) {
             dict[t].Shuffle_(rng);
         }
 
         bool changed = true;
         List<SimObjPhysics> shuffledSopList = new List<SimObjPhysics>();
-        while (changed)
-        {
+        while (changed) {
             changed = false;
-            foreach (SimObjType type in types)
-            {
+            foreach (SimObjType type in types) {
                 int i = indDict[type];
-                if (i >= 0)
-                {
+                if (i >= 0) {
                     changed = true;
                     yield return dict[type][i];
                     indDict[type]--;
@@ -1416,16 +1231,11 @@ System.Random rng
         }
     }
 
-    protected static IEnumerator toStandardCoroutineIEnumerator(IEnumerator<float?> enumerator)
-    {
-        while (enumerator.MoveNext())
-        {
-            if ((!enumerator.Current.HasValue) || (enumerator.Current <= 0f))
-            {
+    protected static IEnumerator toStandardCoroutineIEnumerator(IEnumerator<float?> enumerator) {
+        while (enumerator.MoveNext()) {
+            if ((!enumerator.Current.HasValue) || (enumerator.Current <= 0f)) {
                 yield return null;
-            }
-            else
-            {
+            } else {
                 yield return new WaitForFixedUpdate();
             }
         }
@@ -1435,31 +1245,24 @@ public static void StartPhysicsCoroutine(
         MonoBehaviour startCoroutineUsing,
         IEnumerator<float?> enumerator,
         bool? autoSimulation = null
-    )
-    {
+    ) {
         autoSimulation = autoSimulation.GetValueOrDefault(Physics.autoSimulation);
 
-        if (autoSimulation.Value)
-        {
+        if (autoSimulation.Value) {
             startCoroutineUsing.StartCoroutine(toStandardCoroutineIEnumerator(enumerator));
             return;
         }
         var previousAutoSimulate = Physics.autoSimulation;
         Physics.autoSimulation = false;
-        while (enumerator.MoveNext())
-        {
+        while (enumerator.MoveNext()) {
             float? fixedDeltaTime = enumerator.Current;
-            if (!fixedDeltaTime.HasValue)
-            {
+            if (!fixedDeltaTime.HasValue) {
                 fixedDeltaTime = Time.fixedDeltaTime;
             }
 
-            if (fixedDeltaTime == 0f)
-            {
+            if (fixedDeltaTime == 0f) {
                 Physics.SyncTransforms();
-            }
-            else
-            {
+            } else {
                 PhysicsSimulateTHOR(fixedDeltaTime.Value);
             }
         }
@@ -1467,8 +1270,7 @@ public static void StartPhysicsCoroutine(
     }
 
     // Immediately disable physics autosimulation
-    public void PausePhysicsAutoSim()
-    {
+    public void PausePhysicsAutoSim() {
         Physics.autoSimulation = false;
         Physics.autoSyncTransforms = false;
         physicsSimulationPaused = true;
@@ -1479,27 +1281,21 @@ public void AdvancePhysicsStep(
         float timeStep = 0.02f,
         float? simSeconds = null,
         bool allowAutoSimulation = false
-    )
-    {
-        if (timeStep <= 0f && simSeconds.GetValueOrDefault(0f) > 0f)
-        {
+    ) {
+        if (timeStep <= 0f && simSeconds.GetValueOrDefault(0f) > 0f) {
             throw new InvalidOperationException($"timestep must be > 0");
         }
         bool oldPhysicsAutoSim = Physics.autoSimulation;
         Physics.autoSimulation = false;
 
-        while (simSeconds.Value > 0.0f)
-        {
+        while (simSeconds.Value > 0.0f) {
             simSeconds = simSeconds.Value - timeStep;
-            if (simSeconds.Value <= 0)
-            {
+            if (simSeconds.Value <= 0) {
                 // This is necessary to keep lastVelocity up-to-date for all sim objects and is
                 // called just before the last physics simulation step.
                 Rigidbody[] rbs = FindObjectsOfType(typeof(Rigidbody)) as Rigidbody[];
-                foreach (Rigidbody rb in rbs)
-                {
-                    if (rb.GetComponentInParent<SimObjPhysics>())
-                    {
+                foreach (Rigidbody rb in rbs) {
+                    if (rb.GetComponentInParent<SimObjPhysics>()) {
                         SimObjPhysics sop = rb.GetComponentInParent<SimObjPhysics>();
                         sop.lastVelocity = Math.Abs(
                             rb.angularVelocity.sqrMagnitude + rb.velocity.sqrMagnitude
@@ -1517,19 +1313,16 @@ public void AdvancePhysicsStep(
     }
 
     // Immediately enable physics autosimulation
-    public void UnpausePhysicsAutoSim()
-    {
+    public void UnpausePhysicsAutoSim() {
         Physics.autoSimulation = true;
         Physics.autoSyncTransforms = true;
         physicsSimulationPaused = false;
     }
 
 #if UNITY_EDITOR
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.magenta;
-        if (m_Started)
-        {
+        if (m_Started) {
             Matrix4x4 cubeTransform = Matrix4x4.TRS(gizmopos, gizmoquaternion, gizmoscale);
             Matrix4x4 oldGizmosMatrix = Gizmos.matrix;
 
diff --git a/unity/Assets/Scripts/PlacementManager.cs b/unity/Assets/Scripts/PlacementManager.cs
index 1c80eb8046..b885249e50 100644
--- a/unity/Assets/Scripts/PlacementManager.cs
+++ b/unity/Assets/Scripts/PlacementManager.cs
@@ -2,14 +2,10 @@
 using System.Collections;
 using UnityEngine;
 
-public class PlacementManager : MonoBehaviour
-{
-    public static PlacementManager Current
-    {
-        get
-        {
-            if (current == null)
-            {
+public class PlacementManager : MonoBehaviour {
+    public static PlacementManager Current {
+        get {
+            if (current == null) {
                 current = GameObject.FindObjectOfType<PlacementManager>();
             }
             return current;
@@ -30,8 +26,7 @@ public static bool GetPlacementPoint(
         float reach,
         float maxDistance,
         ref Vector3 point
-    )
-    {
+    ) {
         UnityEngine.AI.NavMeshHit hit;
         if (
             UnityEngine.AI.NavMesh.SamplePosition(
@@ -40,8 +35,7 @@ ref Vector3 point
                 maxDistance: maxDistance,
                 areaMask: 1 << NavmeshShelfArea
             )
-        )
-        {
+        ) {
             // check whether we can see this point
             Vector3 viewPoint = agentCamera.WorldToViewportPoint(hit.position);
             Vector3 pointDirection = Vector3.zero;
@@ -52,8 +46,7 @@ ref Vector3 point
                 && viewPoint.x > SimUtil.ViewPointRangeLow // within x bounds
                 && viewPoint.y < SimUtil.ViewPointRangeHigh
                 && viewPoint.y > SimUtil.ViewPointRangeLow
-            )
-            { // within y bounds
+            ) { // within y bounds
                 // do a raycast in the direction of the item
                 pointDirection = (hit.position - agentCameraPos).normalized;
                 RaycastHit pointHit;
@@ -66,8 +59,7 @@ ref Vector3 point
                         SimUtil.RaycastVisibleLayerMask,
                         QueryTriggerInteraction.Ignore
                     ) && (Vector3.Distance(pointHit.point, hit.position) < MaxRaycastCheckDistance)
-                )
-                {
+                ) {
                     // if it's within reasonable distance of the original point, we'll know we're fine
                     point = hit.position;
                     return true;
@@ -77,15 +69,13 @@ ref Vector3 point
         return false;
     }
 
-    public static void PlaceObjectAtPoint(SimObj simObj, Vector3 point)
-    {
+    public static void PlaceObjectAtPoint(SimObj simObj, Vector3 point) {
         simObj.transform.position = point + Vector3.up * DefaultDropDistance;
         simObj.gameObject.SetActive(true);
         Current.StartCoroutine(current.EnableSimObjPhysics(simObj));
     }
 
-    public IEnumerator EnableSimObjPhysics(SimObj simObj)
-    {
+    public IEnumerator EnableSimObjPhysics(SimObj simObj) {
         // always wait for 1 frame to allow sim object to wake itself up
         yield return null;
         // move the simObj to the object root to ensure it's not parented under another rigidbody
diff --git a/unity/Assets/Scripts/PlaneGizmo.cs b/unity/Assets/Scripts/PlaneGizmo.cs
index a8c61a2f2c..f48e95c9c4 100644
--- a/unity/Assets/Scripts/PlaneGizmo.cs
+++ b/unity/Assets/Scripts/PlaneGizmo.cs
@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class PlaneGizmo : MonoBehaviour
-{
+public class PlaneGizmo : MonoBehaviour {
     // Start is called before the first frame update
     void Start() { }
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         //  Gizmos.color = Color.yellow;
 
         Gizmos.color = new Color(1, 0.92f, 0.016f, 1f);
diff --git a/unity/Assets/Scripts/PlayerControllers.cs b/unity/Assets/Scripts/PlayerControllers.cs
index f167feb0ac..a5b88da038 100644
--- a/unity/Assets/Scripts/PlayerControllers.cs
+++ b/unity/Assets/Scripts/PlayerControllers.cs
@@ -5,10 +5,8 @@
 // using PlayerControllers;
 // using UnityStandardAssets.Characters.FirstPerson;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public enum ControlMode
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public enum ControlMode {
         DEBUG_TEXT_INPUT,
         FPS,
         DISCRETE_POINT_CLICK,
@@ -16,8 +14,7 @@ public enum ControlMode
         MINIMAL_FPS
     }
 
-    class PlayerControllers
-    {
+    class PlayerControllers {
         public static Dictionary<ControlMode, Type> controlModeToComponent = new Dictionary<
             ControlMode,
             Type
diff --git a/unity/Assets/Scripts/PrefabNameRevert.cs b/unity/Assets/Scripts/PrefabNameRevert.cs
index 3fd29a0f98..0f704b0429 100644
--- a/unity/Assets/Scripts/PrefabNameRevert.cs
+++ b/unity/Assets/Scripts/PrefabNameRevert.cs
@@ -3,58 +3,45 @@
 using UnityEditor;
 using System.Collections.Generic;
 
-public class PrefabNameRevert
-{
+public class PrefabNameRevert {
     [MenuItem("Prefab/RevertName")]
-    static void RevertPrefabNames()
-    {
+    static void RevertPrefabNames() {
         RevertAllNames(Selection.GetFiltered(typeof(GameObject), SelectionMode.Editable));
     }
 
-    public static string GetPrefabAssetName(GameObject prefab, string name = "")
-    {
+    public static string GetPrefabAssetName(GameObject prefab, string name = "") {
         // Debug.Log("Object " + name + " object: " + prefab.name);
         var original = PrefabUtility.GetCorrespondingObjectFromOriginalSource(prefab);
-        if (original != null)
-        {
+        if (original != null) {
             return original.name;
-        }
-        else
-        {
+        } else {
             Debug.LogError($"No prefab could be found for object '{prefab.name}'");
             return null;
         }
     }
 
-    public static void RemoveNameModification(UnityEngine.Object aObj)
-    {
+    public static void RemoveNameModification(UnityEngine.Object aObj) {
         var mods = new List<PropertyModification>(PrefabUtility.GetPropertyModifications(aObj));
-        for (int i = 0; i < mods.Count; i++)
-        {
-            if (mods[i].propertyPath == "m_Name")
-            {
+        for (int i = 0; i < mods.Count; i++) {
+            if (mods[i].propertyPath == "m_Name") {
                 mods.RemoveAt(i);
             }
         }
         PrefabUtility.SetPropertyModifications(aObj, mods.ToArray());
     }
 
-    public static void RevertAllNames(Object[] aObjects)
-    {
+    public static void RevertAllNames(Object[] aObjects) {
         var items = new List<Object>();
-        foreach (var item in aObjects)
-        {
+        foreach (var item in aObjects) {
             var prefab = PrefabUtility.GetCorrespondingObjectFromOriginalSource(item);
-            if (prefab != null)
-            {
+            if (prefab != null) {
                 Undo.RecordObject(item, "Revert perfab name");
                 item.name = prefab.name;
                 items.Add(item);
             }
         }
         Undo.FlushUndoRecordObjects();
-        foreach (var item in items)
-        {
+        foreach (var item in items) {
             RemoveNameModification(item);
         }
     }
diff --git a/unity/Assets/Scripts/ProceduralAssetDatabase.cs b/unity/Assets/Scripts/ProceduralAssetDatabase.cs
index 6c89713353..2d9d84bf83 100644
--- a/unity/Assets/Scripts/ProceduralAssetDatabase.cs
+++ b/unity/Assets/Scripts/ProceduralAssetDatabase.cs
@@ -4,10 +4,8 @@
 using Priority_Queue;
 using UnityEngine;
 
-namespace Thor.Procedural
-{
-    public class ProceduralAssetDatabase : MonoBehaviour
-    {
+namespace Thor.Procedural {
+    public class ProceduralAssetDatabase : MonoBehaviour {
         public static ProceduralAssetDatabase Instance { get; private set; }
 
         [SerializeField]
@@ -25,10 +23,8 @@ public class ProceduralAssetDatabase : MonoBehaviour
 
         public bool dontDestroyOnLoad = true;
 
-        public void Awake()
-        {
-            if (Instance != null)
-            {
+        public void Awake() {
+            if (Instance != null) {
                 Destroy(gameObject);
                 return;
             }
@@ -37,54 +33,43 @@ public void Awake()
             this.assetMap = new ProceduralLRUCacheAssetMap<GameObject>(
                 prefabs.GroupBy(p => p.name).ToDictionary(p => p.Key, p => p.First())
             );
-            if (dontDestroyOnLoad)
-            {
+            if (dontDestroyOnLoad) {
                 DontDestroyOnLoad(gameObject);
-            }
-            else
-            {
+            } else {
                 // Reset it back to enable caching for next time object is created
                 dontDestroyOnLoad = true;
             }
         }
 
-        public void addAsset(GameObject asset, bool procedural = false)
-        {
+        public void addAsset(GameObject asset, bool procedural = false) {
             // prefabs.Add(asset);
             assetMap.addAsset(asset.name, asset, procedural);
         }
 
-        public void addAssets(IEnumerable<GameObject> assets, bool procedural = false)
-        {
-            foreach (var asset in assets)
-            {
+        public void addAssets(IEnumerable<GameObject> assets, bool procedural = false) {
+            foreach (var asset in assets) {
                 assetMap.addAsset(asset.name, asset, procedural);
             }
         }
 
-        public bool ContainsAssetKey(string key)
-        {
+        public bool ContainsAssetKey(string key) {
             return assetMap.ContainsKey(key);
         }
 
-        public void touchProceduralLRUCache(IEnumerable<string> ids)
-        {
+        public void touchProceduralLRUCache(IEnumerable<string> ids) {
             this.assetMap.touch(ids);
         }
 
-        public void removeLRUItems(int limit)
-        {
+        public void removeLRUItems(int limit) {
             this.assetMap.removeLRU(limit: limit);
         }
 
-        public IEnumerable<GameObject> GetPrefabs()
-        {
+        public IEnumerable<GameObject> GetPrefabs() {
             return this.assetMap.Values();
         }
     }
 
-    public class ProceduralLRUCacheAssetMap<T> : AssetMap<T>
-    {
+    public class ProceduralLRUCacheAssetMap<T> : AssetMap<T> {
         public SimplePriorityQueue<string, int> proceduralAssetQueue { get; private set; }
         public int priorityMinValue { get; private set; }
         public int priorityMaxValue { get; private set; }
@@ -99,8 +84,7 @@ public ProceduralLRUCacheAssetMap(
             int rankingMinValue = 0,
             int rankingMaxValue = 1
         )
-            : base(assetMap)
-        {
+            : base(assetMap) {
             this.priorityMinValue = this.originalPriorityMinValue = rankingMinValue;
             this.priorityMaxValue = this.originalPriorityMaxValue = rankingMaxValue;
             proceduralAssetQueue = new SimplePriorityQueue<string, int>();
@@ -111,37 +95,30 @@ public ProceduralLRUCacheAssetMap(
         // so there can be times if we internally drive the LRU cache that we may delete
         // assets and not have the hook to create them
 
-        public override T getAsset(string name)
-        {
+        public override T getAsset(string name) {
             return assetMap[name];
         }
 
-        public void addAsset(string id, T asset, bool procedural = true)
-        {
-            if (procedural)
-            {
+        public void addAsset(string id, T asset, bool procedural = true) {
+            if (procedural) {
                 proceduralAssetQueue.Enqueue(id, this.priorityMaxValue);
             }
             this.assetMap.Add(id, asset);
         }
 
-        public void touch(IEnumerable<string> ids)
-        {
+        public void touch(IEnumerable<string> ids) {
             this.advanceExpiration();
             this.use(ids);
         }
 
-        public void touch(string id)
-        {
+        public void touch(string id) {
             this.advanceExpiration();
             this.use(id);
         }
 
-        public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true)
-        {
+        public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true) {
             //            Debug.Log($"Running removeLRU with {limit}, {deleteWithHighestPriority}");
-            if (proceduralAssetQueue.Count == 0)
-            {
+            if (proceduralAssetQueue.Count == 0) {
                 //                Debug.Log($"Queue empty, returning");
                 return null;
             }
@@ -154,24 +131,19 @@ public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true
             while (
                 proceduralAssetQueue.Count > limit
                 && (deleteWithHighestPriority || toDequeuePrio < this.priorityMaxValue)
-            )
-            {
+            ) {
                 var removed = proceduralAssetQueue.Dequeue();
-                if (this.getAsset(removed) is GameObject go)
-                {
+                if (this.getAsset(removed) is GameObject go) {
                     go.transform.parent = null;
                     go.SetActive(false);
                     this.assetMap.Remove(removed);
                     GameObject.Destroy(go);
-                }
-                else
-                {
+                } else {
                     this.assetMap.Remove(removed);
                 }
                 //                Debug.Log($"Removing {removed}");
                 dequeueCount++;
-                if (proceduralAssetQueue.Count == 0)
-                {
+                if (proceduralAssetQueue.Count == 0) {
                     break;
                 }
                 current = proceduralAssetQueue.First;
@@ -179,14 +151,12 @@ public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true
             }
             //            Debug.Log($"Remaining in queue {proceduralAssetQueue.Count}");
             AsyncOperation asyncOp = null;
-            if (dequeueCount > 0)
-            {
+            if (dequeueCount > 0) {
                 // WARNING: Async operation, should be ok for deleting assets if using the same creation-deletion hook
                 // cache should be all driven within one system, currently python driven
 
                 asyncOp = Resources.UnloadUnusedAssets();
-                asyncOp.completed += (op) =>
-                {
+                asyncOp.completed += (op) => {
                     Debug.Log("Asyncop callback called calling GC");
                     GC.Collect();
                 };
@@ -194,8 +164,7 @@ public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true
                 // #if !UNITY_EDITOR && !UNITY_WEBGL
                 float timeout = 2.0f;
                 float startTime = Time.realtimeSinceStartup;
-                while (!asyncOp.isDone && Time.realtimeSinceStartup - startTime < timeout)
-                {
+                while (!asyncOp.isDone && Time.realtimeSinceStartup - startTime < timeout) {
                     // waiting
                     continue;
                 }
@@ -205,38 +174,28 @@ public AsyncOperation removeLRU(int limit, bool deleteWithHighestPriority = true
             return asyncOp;
         }
 
-        protected void use(IEnumerable<string> ids)
-        {
-            foreach (var id in ids)
-            {
+        protected void use(IEnumerable<string> ids) {
+            foreach (var id in ids) {
                 this.use(id);
             }
         }
 
-        protected void use(string name)
-        {
-            if (proceduralAssetQueue.Contains(name))
-            {
+        protected void use(string name) {
+            if (proceduralAssetQueue.Contains(name)) {
                 var currentPriority = proceduralAssetQueue.GetPriority(name);
-                if (currentPriority < priorityMaxValue)
-                {
+                if (currentPriority < priorityMaxValue) {
                     proceduralAssetQueue.UpdatePriority(name, priorityMaxValue);
                 }
             }
         }
 
         // Amortized O(n)
-        protected void advanceExpiration()
-        {
-            if (this.priorityMaxValue + 1 != int.MaxValue)
-            {
+        protected void advanceExpiration() {
+            if (this.priorityMaxValue + 1 != int.MaxValue) {
                 this.priorityMinValue++;
                 this.priorityMaxValue++;
-            }
-            else
-            {
-                foreach (var item in proceduralAssetQueue)
-                {
+            } else {
+                foreach (var item in proceduralAssetQueue) {
                     var currentPriority = proceduralAssetQueue.GetPriority(item);
                     var distance = currentPriority - this.priorityMinValue;
                     proceduralAssetQueue.UpdatePriority(
diff --git a/unity/Assets/Scripts/ProceduralAssetEditor.cs b/unity/Assets/Scripts/ProceduralAssetEditor.cs
index fe27efd145..b59d826750 100644
--- a/unity/Assets/Scripts/ProceduralAssetEditor.cs
+++ b/unity/Assets/Scripts/ProceduralAssetEditor.cs
@@ -21,11 +21,9 @@
 using UnityEditor.SceneManagement;
 #endif
 
-namespace Thor.Procedural
-{
+namespace Thor.Procedural {
     [System.Serializable]
-    public class AssetEditorPaths
-    {
+    public class AssetEditorPaths {
         public string serializeBasePath;
         public string materialsRelativePath;
         public string texturesRelativePath;
@@ -36,17 +34,14 @@ public class AssetEditorPaths
     }
 
     [System.Serializable]
-    public class ObjaversePipelinseSettings
-    {
+    public class ObjaversePipelinseSettings {
         public string pythonExecutablePath;
         public string vidaRepo;
         public int timeoutSeconds;
     }
 
-    public class ProceduralAssetEditor : MonoBehaviour
-    {
-        public AssetEditorPaths paths = new AssetEditorPaths()
-        {
+    public class ProceduralAssetEditor : MonoBehaviour {
+        public AssetEditorPaths paths = new AssetEditorPaths() {
             serializeBasePath = "Assets/Resources/ai2thor-objaverse/NoveltyTHOR_Assets",
             materialsRelativePath = "Materials/objaverse",
             texturesRelativePath = "Textures",
@@ -56,8 +51,7 @@ public class ProceduralAssetEditor : MonoBehaviour
             collidersInModelsPath = "Colliders",
         };
 
-        public ObjaversePipelinseSettings objaversePipelineConfig = new ObjaversePipelinseSettings
-        {
+        public ObjaversePipelinseSettings objaversePipelineConfig = new ObjaversePipelinseSettings {
             pythonExecutablePath = "/Users/alvaroh/anaconda3/envs/vida/bin/python",
             vidaRepo = "/Users/alvaroh/ai2/vida",
             timeoutSeconds = 800
@@ -71,15 +65,11 @@ public class ProceduralAssetEditor : MonoBehaviour
         public string objectId;
 
 #if UNITY_EDITOR
-        private string copyTexture(string original, string destinationDir)
-        {
+        private string copyTexture(string original, string destinationDir) {
             var outName = $"{destinationDir}/{Path.GetFileName(original)}";
-            if (!File.Exists(outName))
-            {
+            if (!File.Exists(outName)) {
                 File.Copy(original, outName);
-            }
-            else
-            {
+            } else {
                 Debug.LogWarning(
                     $"Failed to save texture {outName}, as it already extists. To overwite delete them first and load object again."
                 );
@@ -87,13 +77,11 @@ private string copyTexture(string original, string destinationDir)
             return outName;
         }
 
-        private string getAssetRelativePath(string absPath)
-        {
+        private string getAssetRelativePath(string absPath) {
             return string.Join("/", absPath.Split('/').SkipWhile(x => x != "Assets"));
         }
 
-        private Texture2D loadTexture(string textureAbsPath)
-        {
+        private Texture2D loadTexture(string textureAbsPath) {
             return (Texture2D)
                 AssetDatabase.LoadAssetAtPath(
                     getAssetRelativePath(textureAbsPath),
@@ -110,15 +98,13 @@ private Texture2D loadTexture(string textureAbsPath)
 
         // }
 
-        private void SaveTextures(GameObject go, bool savePrefab)
-        {
+        private void SaveTextures(GameObject go, bool savePrefab) {
             var assetId = go.GetComponentInChildren<SimObjPhysics>().assetID;
 
             var matOutPath =
                 $"{paths.serializeBasePath}/{paths.materialsRelativePath}/{assetId}.mat";
 
-            if (File.Exists(matOutPath))
-            {
+            if (File.Exists(matOutPath)) {
                 Debug.LogWarning(
                     $"Failed to save material {matOutPath}, as it already extists. To overwite delete it first and load object again."
                 );
@@ -129,9 +115,7 @@ private void SaveTextures(GameObject go, bool savePrefab)
                         typeof(Material)
                     );
                 go.GetComponentInChildren<MeshRenderer>().sharedMaterial = savedMat;
-            }
-            else
-            {
+            } else {
                 UnityEditor.AssetDatabase.CreateAsset(
                     go.GetComponentInChildren<MeshRenderer>().sharedMaterial,
                     matOutPath
@@ -144,8 +128,7 @@ private void SaveTextures(GameObject go, bool savePrefab)
             var outTextureBasePath =
                 $"{Application.dataPath}/{dir}/{paths.texturesRelativePath}/{assetId}";
 
-            if (!Directory.Exists(outTextureBasePath))
-            {
+            if (!Directory.Exists(outTextureBasePath)) {
                 Directory.CreateDirectory(outTextureBasePath);
             }
 
@@ -213,8 +196,7 @@ private void SaveTextures(GameObject go, bool savePrefab)
             // mf.sharedMesh = mesh;
 
 
-            if (savePrefab)
-            {
+            if (savePrefab) {
                 PrefabUtility.SaveAsPrefabAssetAndConnect(
                     go,
                     $"{paths.serializeBasePath}/{paths.prefabsRelativePath}/{assetId}.prefab",
@@ -224,8 +206,7 @@ private void SaveTextures(GameObject go, bool savePrefab)
         }
 
         // NOT WORKIGN drag prefab manually
-        private void SavePrefab(GameObject go)
-        {
+        private void SavePrefab(GameObject go) {
             // var dir = string.Join("/", SerializeMesh.serializeBasePath.Split('/').Skip(1));
             var path = $"{paths.serializeBasePath}/{paths.prefabsRelativePath}/{go.name}.prefab";
             Debug.Log($"---- Savingprefabs {path}");
@@ -240,8 +221,7 @@ out prefabSuccess
             Debug.Log($"---- prefab save {prefabSuccess}");
         }
 
-        private GameObject importAsset(string objectPath, bool addAnotationComponent = false)
-        {
+        private GameObject importAsset(string objectPath, bool addAnotationComponent = false) {
             var jsonStr = System.IO.File.ReadAllText(objectPath);
 
             JObject obj = JObject.Parse(jsonStr);
@@ -283,20 +263,15 @@ private GameObject importAsset(string objectPath, bool addAnotationComponent = f
             // var intermediate = result["intermediateGameObject"] as GameObject;
             // DestroyImmediate(intermediate);
 
-            if (go.transform.parent != null && !go.transform.parent.gameObject.activeSelf)
-            {
+            if (go.transform.parent != null && !go.transform.parent.gameObject.activeSelf) {
                 go.transform.parent.gameObject.SetActive(true);
             }
 
-            if (savePrefabsOnLoad)
-            {
+            if (savePrefabsOnLoad) {
                 SaveTextures(go, savePrefab);
-            }
-            else
-            {
+            } else {
                 var runtimeP = go.GetComponent<RuntimePrefab>();
-                if (runtimeP != null)
-                {
+                if (runtimeP != null) {
                     runtimeP.RealoadTextures();
                 }
             }
@@ -307,11 +282,9 @@ private GameObject importAsset(string objectPath, bool addAnotationComponent = f
 
         // TODO: put in ifdef  block
         [Button(Expanded = true)]
-        public void LoadObject()
-        {
+        public void LoadObject() {
             var file = objectId.Trim();
-            if (!file.EndsWith(".json"))
-            {
+            if (!file.EndsWith(".json")) {
                 file += ".json";
             }
 
@@ -327,8 +300,7 @@ public void LoadObject()
             Debug.Log(objectPath);
             // this.loadedHouse = readHouseFromJson(objectPath);
 
-            if (!File.Exists(objectPath))
-            {
+            if (!File.Exists(objectPath)) {
                 cancellAll = false;
                 Debug.Log("Starting objaverse pipeline background process...");
                 coroutines.Add(
@@ -336,19 +308,15 @@ public void LoadObject()
                         runAssetPipelineAsync(
                             objectId,
                             objaverseRoot,
-                            () =>
-                            {
-                                if (!cancellAll)
-                                {
+                            () => {
+                                if (!cancellAll) {
                                     importAsset(objectPath, addAnotationComponent: true);
                                 }
                             }
                         )
                     )
                 );
-            }
-            else
-            {
+            } else {
                 importAsset(objectPath, forceCreateAnnotationComponent);
             }
 
@@ -362,21 +330,18 @@ public void LoadObject()
         }
 
         [Button(Expanded = true)]
-        public void CancelAll()
-        {
+        public void CancelAll() {
             EditorUtility.ClearProgressBar();
             cancellAll = true;
 
-            foreach (var ap in this.processingIds.Values)
-            {
+            foreach (var ap in this.processingIds.Values) {
                 Debug.Log($"Cancelled conversion process for '{ap.id}'");
                 ap.process.Kill();
                 ap.process.CancelOutputRead();
                 ap.process.CancelErrorRead();
             }
 
-            foreach (var coroutine in coroutines)
-            {
+            foreach (var coroutine in coroutines) {
                 StopCoroutine(coroutine);
             }
 
@@ -386,8 +351,7 @@ public void CancelAll()
 
         // [UnityEditor.MenuItem("Procedural/Fix Prefabs")]
         [Button(Expanded = false)]
-        public void FixPrefabs()
-        {
+        public void FixPrefabs() {
             var procAssets = GameObject.FindObjectsOfType(typeof(SimObjPhysics)) as SimObjPhysics[];
 
             //var gos = procAssets.GroupBy(so => so.assetID).Select(k => (IdentifierCase: k.Key, go: k.First().gameObject)).Where(p => p.go.GetComponentInChildren<SerializeMesh>() != null);
@@ -436,11 +400,9 @@ public void FixPrefabs()
             // });
 
 
-            foreach (var (assetId, go) in gos)
-            {
+            foreach (var (assetId, go) in gos) {
                 var dir = string.Join("/", paths.serializeBasePath.Split('/').Skip(1));
-                if (PrefabUtility.IsPartOfPrefabInstance(go))
-                {
+                if (PrefabUtility.IsPartOfPrefabInstance(go)) {
                     SerializeMesh.SaveMeshesAsObjAndReplaceReferences(
                         go,
                         assetId,
@@ -456,8 +418,7 @@ public void FixPrefabs()
                     //     meshGo.transform.localEulerAngles = negRot;
                     // }
                     Debug.Log($"Ran for {go.name}");
-                    if (go.GetComponentInChildren<SerializeMesh>() != null)
-                    {
+                    if (go.GetComponentInChildren<SerializeMesh>() != null) {
                         DestroyImmediate(go.GetComponentInChildren<SerializeMesh>());
                     }
 
@@ -472,14 +433,11 @@ public void FixPrefabs()
         }
 
         [MenuItem("Procedural/Revert Prefabs")]
-        public void RevertPrefabs()
-        {
+        public void RevertPrefabs() {
             var simObjs = GameObject.FindObjectsOfType(typeof(SimObjPhysics)) as SimObjPhysics[];
 
-            foreach (var so in simObjs)
-            {
-                if (PrefabUtility.IsPartOfPrefabInstance(so.gameObject))
-                {
+            foreach (var so in simObjs) {
+                if (PrefabUtility.IsPartOfPrefabInstance(so.gameObject)) {
                     Debug.Log($"Reverting {so.gameObject}");
                     //PrefabUtility.RevertPropertyOverride()
                     PrefabUtility.RevertPrefabInstance(so.gameObject, InteractionMode.UserAction);
@@ -488,56 +446,43 @@ public void RevertPrefabs()
         }
 
         [Button(Expanded = true)]
-        public void SaveObjectPrefabAndTextures()
-        {
+        public void SaveObjectPrefabAndTextures() {
             var transformRoot = GameObject.Find(objectId);
             var transform = gameObject.transform.root.FirstChildOrDefault(g => g.name == objectId);
 
-            if (transform == null)
-            {
+            if (transform == null) {
                 transform = transformRoot.transform;
             }
             // Debug.Log($"Root: {gameObject.transform.root.name}");
-            if (transform != null)
-            {
+            if (transform != null) {
                 SaveTextures(transform.gameObject, savePrefab);
-            }
-            else
-            {
+            } else {
                 Debug.LogError($"Invalid object {objectId} not present in scene.");
             }
         }
 
         [Button(Expanded = true)]
-        public void SaveAllPrefabsAndTextures()
-        {
+        public void SaveAllPrefabsAndTextures() {
             var procAssets = GameObject.FindObjectsOfType(typeof(RuntimePrefab)) as RuntimePrefab[];
             // var procAssets = gameObject.transform.root.GetComponentsInChildren<RuntimePrefab>();
-            foreach (var asset in procAssets)
-            {
-                if (asset != null)
-                {
+            foreach (var asset in procAssets) {
+                if (asset != null) {
                     SaveTextures(asset.gameObject, savePrefab);
-                }
-                else
-                {
+                } else {
                     Debug.LogError($"Invalid object in scene.");
                 }
             }
         }
 
         [UnityEditor.MenuItem("Procedural/Reload Procedural Asset Textures _s")]
-        public static void ReloadTextures()
-        {
+        public static void ReloadTextures() {
             var procAssets = GameObject.FindObjectsOfType(typeof(RuntimePrefab)) as RuntimePrefab[];
-            foreach (var asset in procAssets)
-            {
+            foreach (var asset in procAssets) {
                 asset.RealoadTextures();
             }
         }
 
-        class AsyncProcess
-        {
+        class AsyncProcess {
             public float progress;
             public diagnostics.Process process;
             public string id;
@@ -556,15 +501,13 @@ private IEnumerator waitForProcess(
             int sleepSeconds,
             int debugIntervalSeconds,
             int timeoutSeconds
-        )
-        {
+        ) {
             var secs = 0;
             var start = Time.realtimeSinceStartup;
             var prevCount = processingIds.Count;
             var updateProgressBar = false;
             Debug.Log("Running objaverse conversion pipeline...");
-            while (!p.HasExited)
-            {
+            while (!p.HasExited) {
                 // var currentCount = processingIds.Count;
                 // p.StandardOutput.ReadAsync()
                 yield return new WaitForSeconds(sleepSeconds);
@@ -574,16 +517,14 @@ int timeoutSeconds
 
                 var deltaSeconds = Time.realtimeSinceStartup - start;
                 int roundedSeconds = (int)Mathf.Round(deltaSeconds);
-                if (roundedSeconds % debugIntervalSeconds == 0)
-                {
+                if (roundedSeconds % debugIntervalSeconds == 0) {
                     Debug.Log($"Ran pipeline for ({roundedSeconds}) for '{id}'.");
 
                     // Debug.Log($"Output: {p.StandardOutput.ReadToEnd()}");
                     // Debug.Log($"Error Out: {p.StandardError.ReadToEnd()}");
                 }
 
-                if (currentCount < prevCount)
-                {
+                if (currentCount < prevCount) {
                     //  prevCount = currentCount;
                     EditorUtility.DisplayProgressBar(
                         "Objaverse import",
@@ -598,8 +539,7 @@ int timeoutSeconds
                 // }
 
 
-                if (deltaSeconds >= timeoutSeconds)
-                {
+                if (deltaSeconds >= timeoutSeconds) {
                     Debug.Log(
                         $"Timeout reached, possible issue with object '{id}', or increase components 'objaversePipelineConfig.timeoutSeconds'."
                     );
@@ -609,8 +549,7 @@ int timeoutSeconds
             }
         }
 
-        private diagnostics.Process runPythonCommand(string id, string saveDir)
-        {
+        private diagnostics.Process runPythonCommand(string id, string saveDir) {
             diagnostics.Process p = new diagnostics.Process();
             var pythonFilename =
                 $"{objaversePipelineConfig.vidaRepo}/data_generation/objaverse/object_consolidater_blender_direct.py";
@@ -620,8 +559,7 @@ private diagnostics.Process runPythonCommand(string id, string saveDir)
             p.StartInfo = new diagnostics.ProcessStartInfo(
                 objaversePipelineConfig.pythonExecutablePath,
                 $"{pythonFilename} {objectId} {saveDir}"
-            )
-            {
+            ) {
                 RedirectStandardOutput = true,
                 UseShellExecute = false,
                 CreateNoWindow = true,
@@ -635,8 +573,7 @@ private diagnostics.Process runPythonCommand(string id, string saveDir)
 
             processingIds.GetOrAdd(
                 id,
-                new AsyncProcess()
-                {
+                new AsyncProcess() {
                     id = id,
                     process = p,
                     progress = 0.0f
@@ -656,8 +593,7 @@ private diagnostics.Process runPythonCommand(string id, string saveDir)
         //     return processingIds.Values.Sum() / processingIds.Count;
         // }
 
-        private IEnumerator runAssetPipelineAsync(string id, string saveDir, Action callback = null)
-        {
+        private IEnumerator runAssetPipelineAsync(string id, string saveDir, Action callback = null) {
             // processingIds.TryUpdate(id)
             EditorUtility.DisplayProgressBar(
                 "Objaverse import",
@@ -703,8 +639,7 @@ private IEnumerator runAssetPipelineAsync(string id, string saveDir, Action call
             EditorUtility.DisplayProgressBar("Objaverse import", $"'{id}' Finished!", 1f);
 
             processingIds.TryRemove(id, out AsyncProcess val);
-            if (processingIds.IsEmpty)
-            {
+            if (processingIds.IsEmpty) {
                 EditorUtility.ClearProgressBar();
             }
         }
diff --git a/unity/Assets/Scripts/ProceduralData.cs b/unity/Assets/Scripts/ProceduralData.cs
index 7358aa07d3..8aa95b16b3 100644
--- a/unity/Assets/Scripts/ProceduralData.cs
+++ b/unity/Assets/Scripts/ProceduralData.cs
@@ -12,12 +12,10 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-namespace Thor.Procedural.Data
-{
+namespace Thor.Procedural.Data {
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class AssetMetadata
-    {
+    public class AssetMetadata {
         public string id;
         public string type;
         public string primaryProperty;
@@ -27,8 +25,7 @@ public class AssetMetadata
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ProbeParameters
-    {
+    public class ProbeParameters {
         public string id;
         public Vector3 position;
         public float intensity;
@@ -40,8 +37,7 @@ public class ProbeParameters
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class LightParameters
-    {
+    public class LightParameters {
         public string id { get; set; }
         public string type { get; set; }
         public Vector3 position { get; set; }
@@ -69,8 +65,7 @@ this is a light that is a child of some sim object (ie: lamp) and it is controll
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ShadowParameters
-    {
+    public class ShadowParameters {
         public string type { get; set; } = "Soft";
         public float strength { get; set; } = 1.0f;
 
@@ -82,22 +77,18 @@ public class ShadowParameters
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class SerializableColor
-    {
+    public class SerializableColor {
         public float r { get; set; }
         public float g { get; set; }
         public float b { get; set; }
         public float a { get; set; } = 1.0f;
 
-        public Color toUnityColor()
-        {
+        public Color toUnityColor() {
             return new Color(r, g, b, a);
         }
 
-        public static SerializableColor fromUnityColor(Color color)
-        {
-            return new SerializableColor()
-            {
+        public static SerializableColor fromUnityColor(Color color) {
+            return new SerializableColor() {
                 r = color.r,
                 g = color.g,
                 b = color.b,
@@ -108,8 +99,7 @@ public static SerializableColor fromUnityColor(Color color)
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Margin
-    {
+    public class Margin {
         public float bottom { get; set; }
         public float top { get; set; }
         public float left { get; set; }
@@ -118,8 +108,7 @@ public class Margin
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Door : WallRectangularHole
-    {
+    public class Door : WallRectangularHole {
         public string id { get; set; }
         public string room0 { get; set; }
         public string room1 { get; set; }
@@ -139,8 +128,7 @@ public class Door : WallRectangularHole
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ProceduralParameters
-    {
+    public class ProceduralParameters {
         public float floorColliderThickness { get; set; }
         public float minWallColliderThickness { get; set; }
         public float receptacleHeight { get; set; }
@@ -151,8 +139,7 @@ public class ProceduralParameters
 
         public List<ProbeParameters> reflections;
 
-        public MaterialProperties? ceilingMaterial = new MaterialProperties()
-        {
+        public MaterialProperties? ceilingMaterial = new MaterialProperties() {
             tilingDivisorX = 1.0f,
             tilingDivisorY = 1.0f
         };
@@ -169,16 +156,14 @@ public class ProceduralParameters
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class SerializableCollider
-    {
+    public class SerializableCollider {
         public Vector3[] vertices;
         public int[] triangles;
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class PhysicalProperties
-    {
+    public class PhysicalProperties {
         public float mass = 1;
         public float drag = 0;
         public float angularDrag = 0.05f;
@@ -188,8 +173,7 @@ public class PhysicalProperties
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ObjectAnnotations
-    {
+    public class ObjectAnnotations {
         public string objectType = "Undefined";
         public string primaryProperty = "Undefined";
         public string[]? secondaryProperties = null;
@@ -197,12 +181,10 @@ public class ObjectAnnotations
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Ceiling
-    {
+    public class Ceiling {
         public string id { get; set; }
         public List<Vector3> polygon { get; set; }
-        public MaterialProperties material = new MaterialProperties()
-        {
+        public MaterialProperties material = new MaterialProperties() {
             tilingDivisorX = null,
             tilingDivisorY = null
         };
@@ -210,12 +192,10 @@ public class Ceiling
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class RoomHierarchy
-    {
+    public class RoomHierarchy {
         public string id { get; set; }
         public string roomType { get; set; }
-        public MaterialProperties floorMaterial = new MaterialProperties()
-        {
+        public MaterialProperties floorMaterial = new MaterialProperties() {
             tilingDivisorX = 1.0f,
             tilingDivisorY = 1.0f
         };
@@ -230,8 +210,7 @@ public class RoomHierarchy
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class PolygonWall
-    {
+    public class PolygonWall {
         public string id { get; set; }
         public List<Vector3> polygon { get; set; }
         public string roomId { get; set; }
@@ -244,26 +223,22 @@ public class PolygonWall
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class BoundingBox
-    {
+    public class BoundingBox {
         public Vector3 min { get; set; }
         public Vector3 max { get; set; }
 
-        public Vector3 center()
-        {
+        public Vector3 center() {
             return this.min + (this.max - this.min) / 2.0f;
         }
 
-        public Vector3 size()
-        {
+        public Vector3 size() {
             return (this.max - this.min);
         }
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class BoundingBoxWithOffset
-    {
+    public class BoundingBoxWithOffset {
         public Vector3 min { get; set; }
         public Vector3 max { get; set; }
         public Vector3 offset { get; set; }
@@ -271,16 +246,14 @@ public class BoundingBoxWithOffset
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class VectorXZ
-    {
+    public class VectorXZ {
         public int x;
         public int z;
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Window : WallRectangularHole
-    {
+    public class Window : WallRectangularHole {
         public string id { get; set; }
         public string room0 { get; set; }
         public string room1 { get; set; }
@@ -300,8 +273,7 @@ public class Window : WallRectangularHole
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class FlexibleRotation
-    {
+    public class FlexibleRotation {
         // Support Angle-Axis rotation (axis, degrees)
         public Vector3 axis;
         public float degrees;
@@ -310,38 +282,30 @@ public class FlexibleRotation
         private float? _x;
         private float? _y;
         private float? _z;
-        public float? x
-        {
+        public float? x {
             get { return _x; }
-            set
-            {
+            set {
                 _x = value;
                 setAngleAxis();
             }
         }
-        public float? y
-        {
+        public float? y {
             get { return _y; }
-            set
-            {
+            set {
                 _y = value;
                 setAngleAxis();
             }
         }
-        public float? z
-        {
+        public float? z {
             get { return _z; }
-            set
-            {
+            set {
                 _z = value;
                 setAngleAxis();
             }
         }
 
-        private void setAngleAxis()
-        {
-            if (x == null || y == null || z == null)
-            {
+        private void setAngleAxis() {
+            if (x == null || y == null || z == null) {
                 return;
             }
             Vector3 rot = new Vector3(x: x.Value, y: y.Value, z: z.Value);
@@ -350,48 +314,41 @@ private void setAngleAxis()
                 (axis.x == Mathf.Infinity || axis.x == -Mathf.Infinity || float.IsNaN(axis.x))
                 && (axis.y == Mathf.Infinity || axis.y == -Mathf.Infinity || float.IsNaN(axis.y))
                 && (axis.z == Mathf.Infinity || axis.z == -Mathf.Infinity || float.IsNaN(axis.z))
-            )
-            {
+            ) {
                 axis = Vector3.up;
             }
-            if (degrees == Mathf.Infinity || degrees == -Mathf.Infinity || float.IsNaN(degrees))
-            {
+            if (degrees == Mathf.Infinity || degrees == -Mathf.Infinity || float.IsNaN(degrees)) {
                 degrees = 0;
             }
         }
 
-        public static FlexibleRotation fromQuaternion(Quaternion quat)
-        {
+        public static FlexibleRotation fromQuaternion(Quaternion quat) {
             var r = new FlexibleRotation();
             quat.ToAngleAxis(out r.degrees, out r.axis);
             return r;
         }
 
-        public Quaternion toQuaternion()
-        {
+        public Quaternion toQuaternion() {
             return Quaternion.AngleAxis(degrees, axis);
         }
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Child
-    {
+    public class Child {
         public string type { get; set; }
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Taxonomy
-    {
+    public class Taxonomy {
         public string name;
         public List<Taxonomy> children = null;
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class HouseObject
-    {
+    public class HouseObject {
         public string id { get; set; } //set to SimObjPhysics.objectId
         public Vector3 position { get; set; }
         public FlexibleRotation rotation { get; set; }
@@ -417,16 +374,14 @@ public class HouseObject
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Roof
-    {
+    public class Roof {
         public MaterialProperties material { get; set; }
         public string assetId { get; set; }
     }
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ProceduralHouse
-    {
+    public class ProceduralHouse {
         public ProceduralParameters proceduralParameters { get; set; }
         public string id { get; set; }
         public List<RoomHierarchy> rooms { get; set; } = new List<RoomHierarchy>();
@@ -440,8 +395,7 @@ public class ProceduralHouse
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class NavMeshConfig
-    {
+    public class NavMeshConfig {
         public int id;
         public float agentRadius;
         public int? tileSize;
@@ -454,8 +408,7 @@ public class NavMeshConfig
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class HouseMetadata
-    {
+    public class HouseMetadata {
         public Dictionary<string, AgentPose> agentPoses { get; set; }
         public string schema { get; set; } = null;
 
@@ -464,8 +417,7 @@ public class HouseMetadata
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class AgentPose
-    {
+    public class AgentPose {
         public float horizon;
         public Vector3 position;
         public Vector3 rotation;
@@ -474,8 +426,7 @@ public class AgentPose
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class MaterialProperties
-    {
+    public class MaterialProperties {
         // TODO: move material id, color (as albedo) and tiling divisors
         public string name { get; set; }
         public SerializableColor color { get; set; }
@@ -487,8 +438,7 @@ public class MaterialProperties
         public float? smoothness;
     }
 
-    public interface WallRectangularHole
-    {
+    public interface WallRectangularHole {
         string id { get; set; }
         string assetId { get; set; }
         string room0 { get; set; }
@@ -506,8 +456,7 @@ public interface WallRectangularHole
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class Wall
-    {
+    public class Wall {
         public string id;
         public float height;
         public Vector3 p0;
@@ -527,8 +476,7 @@ public class Wall
 
     [Serializable]
     [MessagePackObject(keyAsPropertyName: true)]
-    public class ProceduralAsset
-    {
+    public class ProceduralAsset {
         public Vector3[] vertices;
         public Vector3[] normals;
         public string name;
@@ -548,13 +496,10 @@ public class ProceduralAsset
         public string parentTexturesDir = null;
     }
 
-    public static class ExtensionMethods
-    {
-        public static T DeepClone<T>(this T obj)
-        {
+    public static class ExtensionMethods {
+        public static T DeepClone<T>(this T obj) {
             // Don't serialize a null object, simply return the default for that object
-            if (ReferenceEquals(obj, null))
-            {
+            if (ReferenceEquals(obj, null)) {
                 return default;
             }
 
@@ -566,8 +511,7 @@ public static T DeepClone<T>(this T obj)
             var str = Newtonsoft.Json.JsonConvert.SerializeObject(
                 obj,
                 Newtonsoft.Json.Formatting.None,
-                new Newtonsoft.Json.JsonSerializerSettings()
-                {
+                new Newtonsoft.Json.JsonSerializerSettings() {
                     ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                     ContractResolver = jsonResolver
                 }
@@ -582,8 +526,7 @@ public static TValue GetValueOrDefault<TKey, TValue>(
             this Dictionary<TKey, TValue> dictionary,
             TKey key,
             TValue defaultValue = default(TValue)
-        )
-        {
+        ) {
             TValue value;
             return dictionary.TryGetValue(key, out value) ? value : defaultValue;
         }
@@ -592,16 +535,12 @@ public static int AddCount<TKey>(
             this Dictionary<TKey, int> dictionary,
             TKey key,
             int count = 1
-        )
-        {
+        ) {
             int value;
             dictionary.TryGetValue(key, out value);
-            if (dictionary.ContainsKey(key))
-            {
+            if (dictionary.ContainsKey(key)) {
                 dictionary[key] = dictionary[key] + count;
-            }
-            else
-            {
+            } else {
                 dictionary[key] = count;
             }
             return dictionary[key];
diff --git a/unity/Assets/Scripts/ProceduralRoomEditor.cs b/unity/Assets/Scripts/ProceduralRoomEditor.cs
index ac8318f3e5..f30d4734ed 100644
--- a/unity/Assets/Scripts/ProceduralRoomEditor.cs
+++ b/unity/Assets/Scripts/ProceduralRoomEditor.cs
@@ -17,13 +17,11 @@
 #endif
 
 [ExecuteInEditMode]
-public class ProceduralRoomEditor : MonoBehaviour
-{
+public class ProceduralRoomEditor : MonoBehaviour {
     private List<(Vector3, Color)> spheres = new List<(Vector3, Color)>();
     public ProceduralHouse loadedHouse;
 
-    protected class NamedSimObj
-    {
+    protected class NamedSimObj {
         public string assetId;
         public string id;
         public SimObjPhysics simObj;
@@ -35,8 +33,7 @@ protected class NamedSimObj
 
 #if UNITY_EDITOR
 
-    private ProceduralHouse readHouseFromJson(string fileName)
-    {
+    private ProceduralHouse readHouseFromJson(string fileName) {
         var path = BuildLayoutPath(fileName);
         Debug.Log($"Loading: '{path}'");
         var jsonStr = System.IO.File.ReadAllText(path);
@@ -47,12 +44,10 @@ private ProceduralHouse readHouseFromJson(string fileName)
         return obj.ToObject<ProceduralHouse>();
     }
 
-    private List<NamedSimObj> assignObjectIds()
-    {
+    private List<NamedSimObj> assignObjectIds() {
         var root = GameObject.Find(ProceduralTools.DefaultObjectsRootName);
         //var counter = new Dictionary<SimObjType, int>();
-        if (root != null)
-        {
+        if (root != null) {
             var simobjs = root.transform.GetComponentsInChildren<SimObjPhysics>();
 
             var namedObjects = simobjs
@@ -61,8 +56,7 @@ private List<NamedSimObj> assignObjectIds()
                 .SelectMany(objsOfType =>
                     objsOfType.Select(
                         (simObj, index) =>
-                            new NamedSimObj
-                            {
+                            new NamedSimObj {
                                 assetId = !string.IsNullOrEmpty(simObj.assetID)
                                     ? simObj.assetID
                                     : PrefabNameRevert.GetPrefabAssetName(simObj.gameObject),
@@ -72,8 +66,7 @@ private List<NamedSimObj> assignObjectIds()
                     )
                 )
                 .ToList();
-            foreach (var namedObj in namedObjects)
-            {
+            foreach (var namedObj in namedObjects) {
                 Debug.Log(
                     $" Renaming obj: {namedObj.simObj.gameObject.name} to {namedObj.id}, assetId: {namedObj.assetId}"
                 );
@@ -85,17 +78,14 @@ private List<NamedSimObj> assignObjectIds()
             // foreach (var namedObj in this.namedSimObjects) {
             //     Debug.Log($" Renamed obj: {namedObj.simObj.gameObject.name} to {namedObj.id}, assetId: {namedObj.assetId}" );
             // }
-        }
-        else
-        {
+        } else {
             Debug.LogError($"No root object '{ProceduralTools.DefaultObjectsRootName}'");
             return null;
         }
     }
 
     [Button(Expanded = true)]
-    public void LoadLayout()
-    {
+    public void LoadLayout() {
         this.loadedHouse = readHouseFromJson(this.layoutJSONFilename);
 
         var houseObj = ProceduralTools.CreateHouse(
@@ -104,8 +94,7 @@ public void LoadLayout()
         );
     }
 
-    private List<Vector3> getPolygonFromWallPoints(Vector3 p0, Vector3 p1, float height)
-    {
+    private List<Vector3> getPolygonFromWallPoints(Vector3 p0, Vector3 p1, float height) {
         return new List<Vector3>() { p0, p1, p1 + Vector3.up * height, p0 + Vector3.up * height };
     }
 
@@ -114,14 +103,12 @@ private List<Vector3> getPolygonFromWallObject(
         GameObject wall,
         bool reverse = false,
         bool debug = false
-    )
-    {
+    ) {
         var box = wall.GetComponent<BoxCollider>();
         var offset = box.size / 2.0f;
         offset.z = 0.0f;
 
-        if (debug)
-        {
+        if (debug) {
             Debug.Log(
                 " wall "
                     + $"name: '{wall.gameObject.name}' "
@@ -150,18 +137,14 @@ private List<Vector3> getPolygonFromWallObject(
             wall.transform.TransformPoint(box.center + new Vector3(-offset.x, offset.y, 0.0f)),
         };
 
-        if (!reverse)
-        {
+        if (!reverse) {
             return r;
-        }
-        else
-        {
+        } else {
             return new List<Vector3>() { r[1], r[0], r[3], r[2] };
         }
     }
 
-    public class ConnectionAndWalls
-    {
+    public class ConnectionAndWalls {
         public WallRectangularHole connection;
         public List<(PolygonWall wall, string afterWallId)> walls;
 
@@ -174,14 +157,12 @@ private IEnumerable<ConnectionAndWalls> serializeConnections(
         string prefix,
         Dictionary<string, PolygonWall> wallMap,
         Dictionary<string, WallRectangularHole> connectionMap = null
-    )
-    {
+    ) {
         var flippedForward = filterType == SimObjType.Window;
         var connectionsWithWalls = connections
             .Where(s => s.Type == filterType)
             .Select(
-                (d, i) =>
-                {
+                (d, i) => {
                     var id = d.gameObject.name;
 
                     // Debug.Log($"----- {prefix} " + d.gameObject.name);
@@ -248,8 +229,7 @@ private IEnumerable<ConnectionAndWalls> serializeConnections(
 
                     var normal = Vector3.Cross((p1World - p0World).normalized, p0UpWorld);
 
-                    var colliderDistances = wallColliders.Select(collider =>
-                    {
+                    var colliderDistances = wallColliders.Select(collider => {
                         var offset = collider.size / 2.0f;
 
                         // Debug.Log("Getting collider: " + collider.gameObject.name + " in dic " + wallMap.ContainsKey(collider.gameObject.name));
@@ -272,8 +252,7 @@ private IEnumerable<ConnectionAndWalls> serializeConnections(
 
                         var upVec = (topP0 - cP0).normalized;
 
-                        return new
-                        {
+                        return new {
                             collider = collider,
                             p0SqrDistance = (p1World - cP0).sqrMagnitude,
                             p1SqrDistance = (p0World - cP1).sqrMagnitude,
@@ -307,8 +286,7 @@ bool wallPointOnConnectionLine(
                         Vector3 direction,
                         Vector3 wallNormal,
                         string name
-                    )
-                    {
+                    ) {
                         var p0Ref = new Vector3(p0World.x, wallP0.y, p0World.z);
                         var p1Ref = new Vector3(p1World.x, wallP1.y, p1World.z);
 
@@ -348,8 +326,7 @@ string name
                         if (
                             name == "wall_3_1"
                             || name == "wall_3_2" && d.gameObject.name == "Window_3"
-                        )
-                        {
+                        ) {
                             Debug.Log(
                                 $" ^^^^^^^^^^ DIRECTION p0 {p0World.x},{p0World.y},{p0World.z} p1 {p1World.x},{p1World.y},{p1World.z} dir {dir.x},{dir.y},{dir.z}"
                             );
@@ -415,8 +392,7 @@ bool pointOnWallLine(
                         Vector3 origin,
                         string name,
                         string side = ""
-                    )
-                    {
+                    ) {
                         var originRef = new Vector3(origin.x, p.y, origin.z);
                         var originToP = (p - originRef);
 
@@ -437,8 +413,7 @@ bool pointOnWallLine(
                             name == "wall_2_6"
                             || name == "wall_2_7"
                             || name == "wall_2_8" && d.gameObject.name == "Window_5"
-                        )
-                        {
+                        ) {
                             Debug.Log(
                                 $"!!!!!!!!!!!!!!! Window_Hung_48x44 wall {name} - {side} walls, p {p}, orig {originRef}, dir {direction} dot0 {dot0} originToP {originToP} t.x {t.x}, t.y {t.y}, t.z {t.z} onLine {onLine} t.x <= (1.0f+tEps) {t.x <= (1.0f + tEps)} t.x >= (0.0f-tEps) {t.x >= (0.0f - tEps)} (Math.Abs(direction.x) > dirEps && t.x <= (1.0f+tEps) && t.x >= (0.0f-tEps))  {(Math.Abs(direction.x) > dirEps && t.x <= (1.0f + tEps) && t.x >= (0.0f - tEps))} ((Math.Abs(direction.z) > dirEps && t.z <= (1.0f+tEps) && t.z >= (0.0f-tEps))) {((Math.Abs(direction.z) > dirEps && t.z <= (1.0f + tEps) && t.z >= (0.0f - tEps)))} "
                             );
@@ -473,8 +448,7 @@ bool pointOnWallLine(
                     // };
 
                     var wallRight = colliderDistances.Aggregate(
-                        new
-                        {
+                        new {
                             collider = box,
                             p0SqrDistance = float.MaxValue,
                             p1SqrDistance = float.MaxValue,
@@ -500,8 +474,7 @@ bool pointOnWallLine(
 
                     // && Vector3.Dot(next.normal, normal) > 0
                     var wallLeft = colliderDistances.Aggregate(
-                        new
-                        {
+                        new {
                             collider = box,
                             p0SqrDistance = float.MaxValue,
                             p1SqrDistance = float.MaxValue,
@@ -510,12 +483,10 @@ bool pointOnWallLine(
                             height = 0.0f,
                             normal = new Vector3()
                         },
-                        (min, next) =>
-                        {
+                        (min, next) => {
                             var name = next.collider.gameObject.name;
                             // if (name == "wall1_7" || name == "wall1_6" || name == "wall1_5" && d.gameObject.name == "Window_1") {
-                            if (name == "wall_2_8" && d.gameObject.name == "Window_Hung_48x44")
-                            {
+                            if (name == "wall_2_8" && d.gameObject.name == "Window_Hung_48x44") {
                                 Debug.Log(
                                     $"########## -- connection {d.gameObject.name} wall Left {name} p1SqrDistance {next.p1SqrDistance}, normal {Vector3.Dot(next.collider.transform.forward, connectionNormal)} !onLine {!pointOnWallLine(next.p1, -dirNormalized, p1World, next.collider.gameObject.name)}"
                                 );
@@ -541,8 +512,7 @@ bool pointOnWallLine(
                     Debug.Log($"^^^^^^^^^^^^ Wall left p0: {wallLeft.p0} p1: {wallLeft.p1}");
 
                     var backWallClosestLeft = colliderDistances.Aggregate(
-                        new
-                        {
+                        new {
                             collider = box,
                             p0SqrDistance = float.MaxValue,
                             p1SqrDistance = float.MaxValue,
@@ -567,8 +537,7 @@ bool pointOnWallLine(
                     );
 
                     var backWallClosestRight = colliderDistances.Aggregate(
-                        new
-                        {
+                        new {
                             collider = box,
                             p0SqrDistance = float.MaxValue,
                             p1SqrDistance = float.MaxValue,
@@ -710,8 +679,7 @@ bool pointOnWallLine(
                         .sharedMaterial;
                     var lenn = (wall.polygon[1] - wall.polygon[0]).magnitude;
                     //   var height =
-                    var wallRev = new PolygonWall
-                    {
+                    var wallRev = new PolygonWall {
                         id = $"wall_{id}_back",
                         roomId = connectionProps?.OpenToRoomId,
                         polygon = new List<Vector3>()
@@ -724,8 +692,7 @@ bool pointOnWallLine(
                         // polygon = getPolygonFromWallPoints(p0, p1, backWallClosestRight.height),
                         // TODO get material somehow
                         // material = connectionProps?.openFromWallMaterial?.name
-                        material = new MaterialProperties()
-                        {
+                        material = new MaterialProperties() {
                             name = material.name,
                             tilingDivisorX = lenn / material.mainTextureScale.x,
                             tilingDivisorY =
@@ -761,10 +728,8 @@ bool pointOnWallLine(
 
                     // assetId = assetId == null ? d.assetID : assetId;
 
-                    if (filterType == SimObjType.Doorway)
-                    {
-                        connection = new Thor.Procedural.Data.Door
-                        {
+                    if (filterType == SimObjType.Doorway) {
+                        connection = new Thor.Procedural.Data.Door {
                             id = id,
 
                             room0 = connectionProps?.OpenFromRoomId,
@@ -788,12 +753,9 @@ bool pointOnWallLine(
                             openness = (connectionProps?.IsOpen).GetValueOrDefault() ? 1.0f : 0.0f,
                             assetId = assetId
                         };
-                    }
-                    else if (filterType == SimObjType.Window)
-                    {
+                    } else if (filterType == SimObjType.Window) {
                         var yMin = p0World.y - wallLeft.p1.y;
-                        connection = new Thor.Procedural.Data.Window
-                        {
+                        connection = new Thor.Procedural.Data.Window {
                             id = id,
 
                             room0 = connectionProps?.OpenFromRoomId,
@@ -898,8 +860,7 @@ bool pointOnWallLine(
                         $"~~~~~~~~~~ Walls to delete {string.Join(", ", toDelete.Select(o => o.collider.name))}"
                     );
 
-                    return new ConnectionAndWalls()
-                    {
+                    return new ConnectionAndWalls() {
                         connection = connection,
                         walls = wallsToCreate,
                         wallIdsToDelete = toDelete.Select(o => o.collider.name).ToList()
@@ -963,10 +924,8 @@ bool pointOnWallLine(
     //     return doorWalls;
     // }
 
-    void OnDrawGizmosSelected()
-    {
-        foreach (var (c, color) in spheres)
-        {
+    void OnDrawGizmosSelected() {
+        foreach (var (c, color) in spheres) {
             Gizmos.color = color;
             Gizmos.DrawSphere(c, 0.2f);
         }
@@ -979,18 +938,15 @@ private PolygonWall createNewWall(
         Vector3 p1,
         float height,
         Material material
-    )
-    {
+    ) {
         var len = (p1 - p0).magnitude;
-        return new PolygonWall
-        {
+        return new PolygonWall {
             id = id,
             roomId = connectionProps?.OpenFromRoomId,
             polygon = getPolygonFromWallPoints(p0, p1, height),
             // TODO get material somehow
             // material = connectionProps?.openFromWallMaterial?.name
-            material = new MaterialProperties()
-            {
+            material = new MaterialProperties() {
                 name = material.name,
                 tilingDivisorX = len / material.mainTextureScale.x,
                 tilingDivisorY = height / material.mainTextureScale.y
@@ -998,8 +954,7 @@ Material material
         };
     }
 
-    private ProceduralHouse regenerateWallsData(ProceduralHouse house)
-    {
+    private ProceduralHouse regenerateWallsData(ProceduralHouse house) {
         // if (this.loadedHouse == null) {
         //     this.loadedHouse = readHouseFromJson(this.layoutJSONFilename);
         // }
@@ -1012,19 +967,16 @@ private ProceduralHouse regenerateWallsData(ProceduralHouse house)
 
         var wallsJson = wallsGOs
             .Select(
-                (w, i) =>
-                {
+                (w, i) => {
                     var material = w.GetComponent<MeshRenderer>().sharedMaterial;
                     var poly = getPolygonFromWallObject(w.gameObject);
                     var box = w.GetComponent<BoxCollider>();
 
-                    return new PolygonWall
-                    {
+                    return new PolygonWall {
                         id = w.gameObject.name,
                         roomId = w.GetComponentInChildren<WallProperties>().RoomId,
                         polygon = poly,
-                        material = new MaterialProperties()
-                        {
+                        material = new MaterialProperties() {
                             name = material.name,
                             tilingDivisorX = box.size.x / material.mainTextureScale.x,
                             tilingDivisorY = box.size.y / material.mainTextureScale.y
@@ -1070,8 +1022,7 @@ private ProceduralHouse regenerateWallsData(ProceduralHouse house)
 
         var wallWithInsertLocation = allNewConnections
             .SelectMany(s => s.walls)
-            .Select(wallIdPair =>
-            {
+            .Select(wallIdPair => {
                 //    Debug.Log($"All Walls: {string.Join(", ", wallsJson.Select(w => w.id))}");
                 // Debug.Log("Wall " +  wallIdPair.wall.id + " search after: '" + wallIdPair.afterWallId + "' find: " + wallsJson.FirstOrDefault( w => string.Equals(w.id, wallIdPair.afterWallId,StringComparison.InvariantCultureIgnoreCase ) )+ " ." + $" find '{string.Join(", ", wallsJson.Where(w => string.Equals(w.id, "wall0_17")))}'");
                 return (
@@ -1084,8 +1035,7 @@ private ProceduralHouse regenerateWallsData(ProceduralHouse house)
             });
         var toDeleteSet = new HashSet<string>(allNewConnections.SelectMany(w => w.wallIdsToDelete));
         //wallsJson = wallsJson.Where(w => !toDeleteSet.Contains(w.id)).ToList();
-        foreach (var pair in wallWithInsertLocation)
-        {
+        foreach (var pair in wallWithInsertLocation) {
             wallsJson.Insert(pair.index + 1, pair.wall);
         }
 
@@ -1101,8 +1051,7 @@ private ProceduralHouse regenerateWallsData(ProceduralHouse house)
         );
         // house.doors = doors.ToList();
         // house.windows = windows.ToList();
-        return new ProceduralHouse
-        {
+        return new ProceduralHouse {
             proceduralParameters = house.proceduralParameters,
             id = house.id,
             rooms = house.rooms,
@@ -1123,30 +1072,26 @@ private ProceduralHouse regenerateWallsData(ProceduralHouse house)
 
     // }
     [Button]
-    public void AssigObjectIds()
-    {
+    public void AssigObjectIds() {
         this.assignObjectIds();
     }
 
     [Button]
-    public void ReloadScene()
-    {
+    public void ReloadScene() {
         var scene = UnityEditor.SceneManagement.EditorSceneManager.GetActiveScene();
 
         UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scene.path);
     }
 
     [Button(Expanded = true)]
-    public void SerializeSceneFromGameObjects(string outFilename)
-    {
+    public void SerializeSceneFromGameObjects(string outFilename) {
         // var path = BuildLayoutPath(layoutJSONFilename);
         // var jsonStr = System.IO.File.ReadAllText(path);
         // JObject jsonObj = JObject.Parse(jsonStr);
         // this.loadedHouse = jsonObj.ToObject<ProceduralHouse>();
 
         // if (this.loadedHouse != null) {
-        if (String.IsNullOrWhiteSpace(this.layoutJSONFilename))
-        {
+        if (String.IsNullOrWhiteSpace(this.layoutJSONFilename)) {
             Debug.LogError(
                 "No base layout filename provided, need this to get procedural params. Add a 'layoutJSONFilename'"
             );
@@ -1176,8 +1121,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
         var skipObjects = new HashSet<SimObjType>() { SimObjType.Doorway, SimObjType.Window };
         house.objects = simObjects
             .Where(obj => !skipObjects.Contains(obj.simObj.Type))
-            .Select(obj =>
-            {
+            .Select(obj => {
                 Vector3 axis;
                 float degrees;
                 obj.simObj.transform.rotation.ToAngleAxis(out degrees, out axis);
@@ -1199,29 +1143,25 @@ public void SerializeSceneFromGameObjects(string outFilename)
                     LayerMask.GetMask("NonInteractive")
                 );
                 string room = "";
-                if (didHit)
-                {
+                if (didHit) {
                     room = hit.collider.transform.GetComponentInParent<SimObjPhysics>()?.ObjectID;
                 }
                 Debug.Log("Processing " + obj.assetId + " ...");
-                if (!assetDb.ContainsKey(obj.assetId))
-                {
+                if (!assetDb.ContainsKey(obj.assetId)) {
                     Debug.LogError(
                         $"Asset '{obj.assetId}' not in AssetLibrary, so it won't be able to be loaded as part of a procedural scene. Save the asset and rebuild asset library."
                     );
                 }
                 // var box = obj.simObj.BoundingBox.GetComponent<BoxCollider>();
                 // box.enabled = true;
-                var serializedObj = new HouseObject()
-                {
+                var serializedObj = new HouseObject() {
                     id = obj.id,
                     position = bb.center,
                     rotation = new FlexibleRotation() { axis = axis, degrees = degrees },
                     kinematic = (
                         obj.simObj.GetComponentInChildren<Rigidbody>()?.isKinematic
                     ).GetValueOrDefault(),
-                    boundingBox = new BoundingBox()
-                    {
+                    boundingBox = new BoundingBox() {
                         min = bb.center - (bb.size / 2.0f),
                         max = bb.center + (bb.size / 2.0f)
                     },
@@ -1242,8 +1182,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
 
         GameObject floorRoot;
         floorRoot = GameObject.Find(house.id);
-        if (floorRoot == null)
-        {
+        if (floorRoot == null) {
             floorRoot = GameObject.Find(ProceduralTools.DefaultHouseRootObjectName);
         }
 
@@ -1255,8 +1194,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
             );
 
         house.rooms = house
-            .rooms.Select(r =>
-            {
+            .rooms.Select(r => {
                 r.roomType = roomIdToProps[r.id].roomProps.RoomType;
                 // TODO add more room annotations here
                 return r;
@@ -1276,8 +1214,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
         var gatheredLights = new List<LightParameters>();
 
         house.proceduralParameters.lights = sceneLights
-            .Select(l =>
-            {
+            .Select(l => {
                 RaycastHit hit;
                 var didHit = Physics.Raycast(
                     l.transform.position,
@@ -1287,26 +1224,22 @@ public void SerializeSceneFromGameObjects(string outFilename)
                     LayerMask.GetMask("NonInteractive")
                 );
                 string room = "";
-                if (didHit)
-                {
+                if (didHit) {
                     room = hit.collider.transform.GetComponentInParent<SimObjPhysics>()?.ObjectID;
                 }
                 // didHit = Physics.Raycast(l.transform.position, -Vector3.up,out hit, 1.0f, LayerMask.GetMask("SimObjVisible", "Procedural1", "Procedural2", "Procedural3", "Procedural0"));
                 string objectLink = "";
                 var parentSim = l.GetComponentInParent<SimObjPhysics>();
                 //SimObjType.Lamp
-                if (parentSim != null)
-                { //( parentSim?.ObjType).GetValueOrDefault() == SimObjType.FloorLamp )
+                if (parentSim != null) { //( parentSim?.ObjType).GetValueOrDefault() == SimObjType.FloorLamp )
                     objectLink = parentSim.ObjectID;
                 }
                 // if (didHit) {
                 //     objectLink = hit.transform.GetComponentInParent<SimObjPhysics>()?.objectID;
                 // }
                 ShadowParameters sp = null;
-                if (l.shadows != LightShadows.None)
-                {
-                    sp = new ShadowParameters()
-                    {
+                if (l.shadows != LightShadows.None) {
+                    sp = new ShadowParameters() {
                         strength = l.shadowStrength,
                         type = Enum.GetName(typeof(LightShadows), l.shadows),
                         normalBias = l.shadowNormalBias,
@@ -1318,8 +1251,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
                         )
                     };
                 }
-                return new LightParameters()
-                {
+                return new LightParameters() {
                     id = l.gameObject.name,
                     type = LightType.GetName(typeof(LightType), l.type),
                     position = l.transform.position,
@@ -1328,8 +1260,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
                     intensity = l.intensity,
                     indirectMultiplier = l.bounceIntensity,
                     range = l.range,
-                    rgb = new SerializableColor()
-                    {
+                    rgb = new SerializableColor() {
                         r = l.color.r,
                         g = l.color.g,
                         b = l.color.b,
@@ -1349,10 +1280,8 @@ public void SerializeSceneFromGameObjects(string outFilename)
                     .GetComponentsInChildren<ReflectionProbe>()
             );
         house.proceduralParameters.reflections = probes
-            .Select(probeComp =>
-            {
-                return new ProbeParameters()
-                {
+            .Select(probeComp => {
+                return new ProbeParameters() {
                     background = SerializableColor.fromUnityColor(probeComp.backgroundColor),
                     intensity = probeComp.intensity,
                     boxSize = probeComp.size,
@@ -1364,8 +1293,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
             })
             .ToList();
 
-        foreach (var probe in house.proceduralParameters.reflections)
-        {
+        foreach (var probe in house.proceduralParameters.reflections) {
             var go = new GameObject(probe.id);
             go.transform.position = probe.position;
 
@@ -1378,8 +1306,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
             probeComp.shadowDistance = probe.shadowDistance;
         }
 
-        house.proceduralParameters.ceilingMaterial = new MaterialProperties()
-        {
+        house.proceduralParameters.ceilingMaterial = new MaterialProperties() {
             name = GameObject
                 .Find(ProceduralTools.DefaultCeilingRootObjectName)
                 .GetComponentInChildren<MeshRenderer>()
@@ -1392,8 +1319,7 @@ public void SerializeSceneFromGameObjects(string outFilename)
         var jsonResolver = new ShouldSerializeContractResolver();
         var outJson = JObject.FromObject(
             house,
-            new Newtonsoft.Json.JsonSerializer()
-            {
+            new Newtonsoft.Json.JsonSerializer() {
                 ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                 ContractResolver = jsonResolver
             }
@@ -1403,11 +1329,9 @@ public void SerializeSceneFromGameObjects(string outFilename)
         System.IO.File.WriteAllText(outPath, outJson.ToString());
     }
 
-    private string BuildLayoutPath(string layoutFilename)
-    {
+    private string BuildLayoutPath(string layoutFilename) {
         layoutFilename = layoutFilename.Trim();
-        if (!layoutFilename.EndsWith(".json"))
-        {
+        if (!layoutFilename.EndsWith(".json")) {
             layoutFilename += ".json";
         }
         var path = Application.dataPath + LoadBasePath + layoutFilename;
@@ -1415,8 +1339,7 @@ private string BuildLayoutPath(string layoutFilename)
     }
 
     [UnityEditor.MenuItem("Procedural/Build Asset Database")]
-    public static void BuildAssetDB()
-    {
+    public static void BuildAssetDB() {
         var proceduralADB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
         // proceduralADB.prefabs = new AssetMap<GameObject>(ProceduralTools.FindPrefabsInAssets().GroupBy(m => m.name).ToDictionary(m => m.Key, m => m.First()));
         // proceduralADB.materials = new AssetMap<Material>(ProceduralTools.FindAssetsByType<Material>().GroupBy(m => m.name).ToDictionary(m => m.Key, m => m.First()));
@@ -1431,8 +1354,7 @@ public static void BuildAssetDB()
     }
 
     [UnityEditor.MenuItem("Procedural/Filter Asset Database")]
-    public static void ReduceAssetDb()
-    {
+    public static void ReduceAssetDb() {
         var proceduralADB = GameObject.FindObjectOfType<ProceduralAssetDatabase>();
 
         var house = readHouseFromJsonStatic("test_0_out.json");
@@ -1451,16 +1373,14 @@ public static void ReduceAssetDb()
     public static void filterADBFromHousesAssets(
         ProceduralAssetDatabase assetDb,
         IEnumerable<ProceduralHouse> houses
-    )
-    {
+    ) {
         var mats = new HashSet<string>(houses.SelectMany(h => getAllMaterials(h)));
         var assets = new HashSet<string>(houses.SelectMany(h => getAssetIds(h)));
         assetDb.prefabs = assetDb.prefabs.Where(p => assets.Contains(p.name)).ToList();
         assetDb.materials = assetDb.materials.Where(p => mats.Contains(p.name)).ToList();
     }
 
-    public static IEnumerable<string> getAllMaterials(ProceduralHouse house)
-    {
+    public static IEnumerable<string> getAllMaterials(ProceduralHouse house) {
         return house
             .rooms.SelectMany(r =>
                 r.ceilings.Select(c => c.material.name)
@@ -1470,16 +1390,14 @@ public static IEnumerable<string> getAllMaterials(ProceduralHouse house)
             .Concat(new List<string>() { house.proceduralParameters.ceilingMaterial.name });
     }
 
-    public static IEnumerable<string> getAssetIds(ProceduralHouse house)
-    {
+    public static IEnumerable<string> getAssetIds(ProceduralHouse house) {
         return house
             .objects.Select(o => o.assetId)
             .Concat(house.windows.Select(w => w.assetId))
             .Concat(house.doors.Select(d => d.assetId));
     }
 
-    public static ProceduralHouse readHouseFromJsonStatic(string fileName)
-    {
+    public static ProceduralHouse readHouseFromJsonStatic(string fileName) {
         var path = BuildLayoutPathStatic(fileName);
         Debug.Log($"Loading: '{path}'");
         var jsonStr = System.IO.File.ReadAllText(path);
@@ -1490,12 +1408,10 @@ public static ProceduralHouse readHouseFromJsonStatic(string fileName)
         return obj.ToObject<ProceduralHouse>();
     }
 
-    public static string BuildLayoutPathStatic(string layoutFilename)
-    {
+    public static string BuildLayoutPathStatic(string layoutFilename) {
         layoutFilename = layoutFilename.Trim();
         string LoadBasePath = "/Resources/rooms/";
-        if (!layoutFilename.EndsWith(".json"))
-        {
+        if (!layoutFilename.EndsWith(".json")) {
             layoutFilename += ".json";
         }
         var path = Application.dataPath + LoadBasePath + layoutFilename;
diff --git a/unity/Assets/Scripts/ProceduralTemplates.cs b/unity/Assets/Scripts/ProceduralTemplates.cs
index bda1bd3915..48c584a9e1 100644
--- a/unity/Assets/Scripts/ProceduralTemplates.cs
+++ b/unity/Assets/Scripts/ProceduralTemplates.cs
@@ -15,11 +15,9 @@
 using UnityEditor;
 #endif
 
-namespace Thor.Procedural
-{
+namespace Thor.Procedural {
     [Serializable]
-    public class HouseTemplate
-    {
+    public class HouseTemplate {
         public string id;
         public string layout;
         public HouseMetadata metadata;
@@ -32,8 +30,7 @@ public class HouseTemplate
     }
 
     [Serializable]
-    public class RoomTemplate
-    {
+    public class RoomTemplate {
         public PolygonWall wallTemplate;
         public RoomHierarchy floorTemplate;
 
@@ -41,13 +38,11 @@ public class RoomTemplate
         public float wallHeight = 2.0f;
     }
 
-    public static class Templates
-    {
+    public static class Templates {
         public static ProceduralHouse createHouseFromTemplate(
             HouseTemplate houseTemplate,
             int outsideBoundaryId = 0
-        )
-        {
+        ) {
             var layout = houseTemplate.layout;
             var objects = houseTemplate.objectsLayouts;
 
@@ -55,8 +50,7 @@ public static ProceduralHouse createHouseFromTemplate(
                 l.Split('\n')
                     .Select(x =>
                         x.Split(' ')
-                            .Select(i =>
-                            {
+                            .Select(i => {
                                 int res;
                                 var isInt = int.TryParse(i, out res);
                                 return (res, isInt);
@@ -86,8 +80,7 @@ public static ProceduralHouse createHouseFromTemplate(
             IEnumerable<KeyValuePair<string, WallRectangularHole>> holePairs =
                 new List<KeyValuePair<string, WallRectangularHole>>();
 
-            if (houseTemplate.doors != null)
-            {
+            if (houseTemplate.doors != null) {
                 holePairs = holePairs.Concat(
                     houseTemplate.doors.Select(d => new KeyValuePair<string, WallRectangularHole>(
                         d.Key,
@@ -95,8 +88,7 @@ d.Value as WallRectangularHole
                     ))
                 );
             }
-            if (houseTemplate.windows != null)
-            {
+            if (houseTemplate.windows != null) {
                 holePairs = holePairs.Concat(
                     houseTemplate.windows.Select(d => new KeyValuePair<string, WallRectangularHole>(
                         d.Key,
@@ -118,8 +110,7 @@ d.Value as WallRectangularHole
                     (row, column + 1)
                 };
 
-            if (layoutIntArray.Select(r => r.Length).Distinct().Count() > 1)
-            {
+            if (layoutIntArray.Select(r => r.Length).Distinct().Count() > 1) {
                 throw new ArgumentException("Invalid layout all rows must be the same size");
             }
 
@@ -135,12 +126,10 @@ d.Value as WallRectangularHole
                         objectLayer.SelectMany(
                             (objectRow, row) =>
                                 objectRow.Select(
-                                    (id, column) =>
-                                    {
+                                    (id, column) => {
                                         // ignore no door ones
                                         var isHole = holeTemplates.Keys.Contains(id);
-                                        if (isHole)
-                                        {
+                                        if (isHole) {
                                             var neighborIndices = new List<(int row, int column)>()
                                             {
                                                 (row, column)
@@ -165,8 +154,7 @@ d.Value as WallRectangularHole
                                             var neighborFunctions = neighborIndices
                                                 .Take(2)
                                                 .Select((index, i) => (index, i))
-                                                .Where(v =>
-                                                {
+                                                .Where(v => {
                                                     return ProceduralTools.withinArrayBoundary(
                                                             v.index,
                                                             rows,
@@ -180,8 +168,7 @@ d.Value as WallRectangularHole
                                                 .Select(tup => nf[tup.i]);
 
                                             var twoHeaded = false;
-                                            if (neighborFunctions.Count() > 1)
-                                            {
+                                            if (neighborFunctions.Count() > 1) {
                                                 var cornerLeftTopNeighbor = (
                                                     row: row - 1,
                                                     column: column - 1
@@ -195,8 +182,7 @@ d.Value as WallRectangularHole
                                                     && objectArray[layer][
                                                         cornerLeftTopNeighbor.row
                                                     ][cornerLeftTopNeighbor.column] == id
-                                                )
-                                                {
+                                                ) {
                                                     neighborFunctions = new List<
                                                         Func<(int, int), (int, int)>
                                                     >()
@@ -204,16 +190,13 @@ d.Value as WallRectangularHole
                                                         ((int row, int col) c) =>
                                                             (c.row - 1, c.col - 1)
                                                     };
-                                                }
-                                                else
-                                                {
+                                                } else {
                                                     twoHeaded = true;
                                                 }
                                             }
 
                                             var doorStarts = neighborFunctions
-                                                .Select(f =>
-                                                {
+                                                .Select(f => {
                                                     var minIndex = (row, column);
                                                     var prevMinIndex = minIndex;
                                                     while (
@@ -225,8 +208,7 @@ d.Value as WallRectangularHole
                                                         && objectArray[layer][minIndex.row][
                                                             minIndex.column
                                                         ] == id
-                                                    )
-                                                    {
+                                                    ) {
                                                         prevMinIndex = minIndex;
                                                         minIndex = f(minIndex);
                                                     }
@@ -234,18 +216,15 @@ d.Value as WallRectangularHole
                                                 })
                                                 .ToList();
 
-                                            foreach (var doorStartIndex in doorStarts)
-                                            {
+                                            foreach (var doorStartIndex in doorStarts) {
                                                 (string, int, (int, int)) key = (
                                                     id,
                                                     layer,
                                                     doorStartIndex
                                                 );
-                                                if (doorDict.ContainsKey(key))
-                                                {
+                                                if (doorDict.ContainsKey(key)) {
                                                     var connected = holeContinuation;
-                                                    if (!twoHeaded)
-                                                    {
+                                                    if (!twoHeaded) {
                                                         var k = holeContinuation.SelectMany(c =>
                                                             doorDict[(id, layer, c)]
                                                         );
@@ -254,9 +233,7 @@ d.Value as WallRectangularHole
                                                     doorDict[key] = new HashSet<(int, int)>(
                                                         doorDict[key].Union(connected)
                                                     );
-                                                }
-                                                else
-                                                {
+                                                } else {
                                                     doorDict[key] = new HashSet<(int, int)>(
                                                         holeContinuation
                                                     );
@@ -283,8 +260,7 @@ d.Value as WallRectangularHole
                 new Dictionary<((double, double), (double, double)), string>();
             var roomsWithWalls = roomIds
                 .Where(id => id != outsideBoundaryId)
-                .Select(intId =>
-                {
+                .Select(intId => {
                     var id = intId.ToString();
                     RoomTemplate template;
                     var inDict = houseTemplate.rooms.TryGetValue(id, out template);
@@ -308,12 +284,9 @@ d.Value as WallRectangularHole
                         room.ceilings == null
                         || room.ceilings.Count < 1
                         || room.ceilings[0].material == null
-                    )
-                    {
+                    ) {
                         ceilingMat = houseTemplate.proceduralParameters.ceilingMaterial;
-                    }
-                    else
-                    {
+                    } else {
                         ceilingMat = room.ceilings[0].material;
                     }
                     room.ceilings =
@@ -328,8 +301,7 @@ d.Value as WallRectangularHole
 
                     var walls = walls2D
                         .Select(
-                            (w, i) =>
-                            {
+                            (w, i) => {
                                 var wallCopy = template.wallTemplate.DeepClone();
                                 wallCopy.id = wallToId(i, room.id, template.wallTemplate.id);
                                 wallCopy.polygon = new List<Vector3>()
@@ -378,8 +350,7 @@ d.Value as WallRectangularHole
 
             var holes = doorDict
                 .SelectMany(
-                    (d, i) =>
-                    {
+                    (d, i) => {
                         var holeTemplateId = d.Key.id;
                         var holeStart = d.Key.index; // d.Value.Min();
                         var holeEnd = d.Value.Max();
@@ -388,24 +359,17 @@ d.Value as WallRectangularHole
 
                         var isDoor = hole is Data.Door;
                         var isWindow = hole is Data.Window;
-                        if (inDict)
-                        {
-                            if (isDoor)
-                            {
+                        if (inDict) {
+                            if (isDoor) {
                                 hole = (hole as Data.Door).DeepClone();
-                            }
-                            else if (isWindow)
-                            {
+                            } else if (isWindow) {
                                 hole = (hole as Data.Window).DeepClone();
                             }
-                        }
-                        else
-                        {
+                        } else {
                             hole = getDefaultHoleTemplate();
                         }
 
-                        if (hole == null)
-                        {
+                        if (hole == null) {
                             return new List<WallRectangularHole>() { };
                         }
 
@@ -421,8 +385,7 @@ d.Value as WallRectangularHole
                             !string.IsNullOrEmpty(hole.room0)
                             && isInt
                             && room0ArrayValue == room1Id
-                        )
-                        {
+                        ) {
                             var tmp = room0Id;
                             room0Id = room1Id;
                             room1Id = tmp;
@@ -437,8 +400,7 @@ d.Value as WallRectangularHole
                             column: holeEnd.column - holeStart.column
                         );
 
-                        if (doorDir.row > 1 || doorDir.column > 1)
-                        {
+                        if (doorDir.row > 1 || doorDir.column > 1) {
                             throw new ArgumentException(" invalid door thickness with id " + d.Key);
                         }
 
@@ -473,8 +435,7 @@ d.Value as WallRectangularHole
                             column: holeStart.column + holeAdjustOffset.column
                         );
 
-                        var wall0 = room0Walls2D.Find(x =>
-                        {
+                        var wall0 = room0Walls2D.Find(x => {
                             var xDiff = Math.Abs(holeStartCoords.row - x.Item1.row);
                             var zDiff = Math.Abs(holeStartCoords.column - x.Item1.column);
 
@@ -498,8 +459,7 @@ d.Value as WallRectangularHole
                                 && Math.Abs(dot) < 1e-4;
                         });
 
-                        var wall1 = room1Walls2D.Find(x =>
-                        {
+                        var wall1 = room1Walls2D.Find(x => {
                             var xDiff = Math.Abs(holeStartCoords.row - x.Item1.row);
                             var zDiff = Math.Abs(holeStartCoords.column - x.Item1.column);
 
@@ -532,8 +492,7 @@ d.Value as WallRectangularHole
                         if (
                             string.IsNullOrEmpty(hole.assetId)
                             || !assetMap.ContainsKey(hole.assetId)
-                        )
-                        {
+                        ) {
                             return new List<WallRectangularHole>() { };
                         }
 
@@ -541,8 +500,7 @@ d.Value as WallRectangularHole
 
                         Debug.Log("---- Hole offset null? " + (hole == null));
 
-                        if (holeOffset == null)
-                        {
+                        if (holeOffset == null) {
                             return new List<WallRectangularHole>() { };
                         }
 
@@ -588,15 +546,13 @@ d.Value as WallRectangularHole
             var strRoomIds = new HashSet<string>(roomIds.Select(x => x.ToString()));
             var houseObjects = objectCoordinates
                 .Where(item => !doorIds.Contains(item.id) && !strRoomIds.Contains(item.id))
-                .SelectMany(item =>
-                {
+                .SelectMany(item => {
                     var coord = item.Item3;
                     var result = new List<HouseObject>();
 
                     var template = houseTemplate.objects.GetValueOrDefault(item.id, null);
 
-                    if (template != null)
-                    {
+                    if (template != null) {
                         var obj = template.DeepClone();
 
                         var count = objectIdCounter.AddCount(item.id);
@@ -605,8 +561,7 @@ d.Value as WallRectangularHole
                         var floorTemplate = houseTemplate.rooms[roomId.ToString()];
                         obj.room = roomIntToId(roomId, floorTemplate.floorTemplate);
 
-                        if (string.IsNullOrEmpty(obj.assetId) || !assetMap.ContainsKey(obj.assetId))
-                        {
+                        if (string.IsNullOrEmpty(obj.assetId) || !assetMap.ContainsKey(obj.assetId)) {
                             return result;
                         }
 
@@ -625,14 +580,12 @@ d.Value as WallRectangularHole
                             ) + centerOffset; // - new Vector3(centerOffset.x, -centerOffset.y, centerOffset.z);
                         obj.rotation =
                             obj.rotation == null
-                                ? new FlexibleRotation()
-                                {
+                                ? new FlexibleRotation() {
                                     axis = new Vector3(0.0f, 1.0f, 0.0f),
                                     degrees = 0
                                 }
                                 : obj.rotation;
-                        if (asset != null)
-                        {
+                        if (asset != null) {
                             result.Add(obj);
                         }
                     }
@@ -640,13 +593,11 @@ d.Value as WallRectangularHole
                     return result;
                 });
 
-            HouseMetadata metadata = new HouseMetadata
-            {
+            HouseMetadata metadata = new HouseMetadata {
                 schema = ProceduralTools.CURRENT_HOUSE_SCHEMA
             };
 
-            return new ProceduralHouse()
-            {
+            return new ProceduralHouse() {
                 metadata = new HouseMetadata() { schema = houseTemplate.metadata.schema },
                 proceduralParameters = houseTemplate.proceduralParameters.DeepClone(),
                 id = !string.IsNullOrEmpty(houseTemplate.id) ? houseTemplate.id : houseId(),
@@ -658,43 +609,34 @@ d.Value as WallRectangularHole
             };
         }
 
-        public static RoomTemplate getDefaultRoomTemplate()
-        {
-            return new RoomTemplate()
-            {
-                wallTemplate = new PolygonWall()
-                {
+        public static RoomTemplate getDefaultRoomTemplate() {
+            return new RoomTemplate() {
+                wallTemplate = new PolygonWall() {
                     polygon = new List<Vector3>() { new Vector3(0.0f, 3.0f, 0.0f) }
                 },
                 floorTemplate = new RoomHierarchy() { }
             };
         }
 
-        public static WallRectangularHole getDefaultHoleTemplate()
-        {
+        public static WallRectangularHole getDefaultHoleTemplate() {
             return new Data.Door();
         }
 
         public static Dictionary<
             (int, int),
             List<((int row, int col), (int row, int col))>
-        > findWalls(int[][] floorplan)
-        {
+        > findWalls(int[][] floorplan) {
             var walls =
                 new DefaultDictionary<(int, int), List<((int row, int col), (int row, int col))>>();
-            for (var row = 0; row < floorplan.Length - 1; row++)
-            {
-                for (var col = 0; col < floorplan[row].Length - 1; col++)
-                {
+            for (var row = 0; row < floorplan.Length - 1; row++) {
+                for (var col = 0; col < floorplan[row].Length - 1; col++) {
                     var a = floorplan[row][col];
                     var b = floorplan[row][col + 1];
-                    if (a != b)
-                    {
+                    if (a != b) {
                         walls[(Math.Min(a, b), Math.Max(a, b))].Add(((row - 1, col), (row, col)));
                     }
                     b = floorplan[row + 1][col];
-                    if (a != b)
-                    {
+                    if (a != b) {
                         walls[(Math.Min(a, b), Math.Max(a, b))].Add(((row, col - 1), (row, col)));
                     }
                 }
@@ -708,43 +650,33 @@ public static Dictionary<
             HashSet<((int row, int col), (int row, int col))>
         > consolidateWalls(
             Dictionary<(int, int), List<((int row, int col), (int row, int col))>> walls
-        )
-        {
+        ) {
             var output =
                 new Dictionary<(int, int), HashSet<((int row, int col), (int row, int col))>>();
-            foreach (var item in walls)
-            {
+            foreach (var item in walls) {
                 var wallGroupId = item.Key;
                 var wallPairs = item.Value;
                 var wallMap = new Dictionary<(int, int), HashSet<(int, int)>>();
 
-                foreach (var wall in wallPairs)
-                {
-                    if (!wallMap.ContainsKey(wall.Item1))
-                    {
+                foreach (var wall in wallPairs) {
+                    if (!wallMap.ContainsKey(wall.Item1)) {
                         wallMap[wall.Item1] = new HashSet<(int, int)>();
                     }
                     wallMap[wall.Item1].Add(wall.Item2);
                 }
                 var didUpdate = true;
-                while (didUpdate)
-                {
+                while (didUpdate) {
                     didUpdate = false;
                     var wallMapCopy = wallMap.Keys.ToDictionary(_ => _, _ => wallMap[_]);
-                    foreach (var w1_1 in wallMapCopy.Keys)
-                    {
-                        if (!wallMap.ContainsKey(w1_1))
-                        {
+                    foreach (var w1_1 in wallMapCopy.Keys) {
+                        if (!wallMap.ContainsKey(w1_1)) {
                             continue;
                         }
                         var breakLoop = false;
-                        foreach (var w1_2 in wallMap[w1_1])
-                        {
-                            if (wallMap.ContainsKey(w1_2))
-                            {
+                        foreach (var w1_2 in wallMap[w1_1]) {
+                            if (wallMap.ContainsKey(w1_2)) {
                                 var w2_1 = w1_2;
-                                foreach (var w2_2 in wallMap[w2_1])
-                                {
+                                foreach (var w2_2 in wallMap[w2_1]) {
                                     if (
                                         (
                                             w1_1.Item1 == w1_2.Item1
@@ -756,14 +688,12 @@ public static Dictionary<
                                             && w1_2.Item2 == w2_1.Item2
                                             && w2_1.Item2 == w2_2.Item2
                                         )
-                                    )
-                                    {
+                                    ) {
                                         wallMap[w2_1].Remove(w2_2);
                                         if (
                                             wallMap.ContainsKey(w2_1)
                                             && (wallMap[w2_1] == null || wallMap[w2_1].Count == 0)
-                                        )
-                                        {
+                                        ) {
                                             wallMap.Remove(w2_1);
                                         }
                                         wallMap[w1_1].Remove(w2_1);
@@ -773,23 +703,19 @@ public static Dictionary<
                                         break;
                                     }
                                 }
-                                if (breakLoop)
-                                {
+                                if (breakLoop) {
                                     break;
                                 }
                             }
-                            if (breakLoop)
-                            {
+                            if (breakLoop) {
                                 break;
                             }
                         }
                     }
                 }
                 output[wallGroupId] = new HashSet<((int row, int col), (int row, int col))>();
-                foreach (var w1 in wallMap.Keys)
-                {
-                    foreach (var w2 in wallMap[w1])
-                    {
+                foreach (var w1 in wallMap.Keys) {
+                    foreach (var w2 in wallMap[w1]) {
                         output[wallGroupId].Add((w1, w2));
                     }
                 }
@@ -808,8 +734,7 @@ public static Dictionary<
             > boundaryGroups,
             float scale,
             int precision
-        )
-        {
+        ) {
             return boundaryGroups.ToDictionary(
                 bg => bg.Key,
                 bg => new HashSet<((double, double), (double, double))>(
@@ -831,8 +756,7 @@ int precision
 
         private static List<((double row, double col), (double row, double col))> getWallLoop(
             List<((double row, double col), (double row, double col))> walls
-        )
-        {
+        ) {
             var remainingWalls = new HashSet<((double row, double col), (double row, double col))>(
                 walls
             );
@@ -841,28 +765,22 @@ int precision
                 walls[0]
             };
             remainingWalls.Remove(walls[0]);
-            while (remainingWalls.Count > 0)
-            {
+            while (remainingWalls.Count > 0) {
                 var didBreak = false;
-                foreach (var wall in remainingWalls)
-                {
-                    if (output.Last().Item2 == wall.Item1)
-                    {
+                foreach (var wall in remainingWalls) {
+                    if (output.Last().Item2 == wall.Item1) {
                         output.Add(wall);
                         remainingWalls.Remove(wall);
                         didBreak = true;
                         break;
-                    }
-                    else if (output.Last().Item2 == wall.Item2)
-                    {
+                    } else if (output.Last().Item2 == wall.Item2) {
                         output.Add((wall.Item2, wall.Item1));
                         remainingWalls.Remove(wall);
                         didBreak = true;
                         break;
                     }
                 }
-                if (!didBreak)
-                {
+                if (!didBreak) {
                     throw new ArgumentException($"No connecting wall for {output.Last()}!");
                 }
             }
@@ -878,26 +796,21 @@ public static Dictionary<
                 HashSet<((double row, double col), (double row, double col))>
             > boundaryGroups,
             IEnumerable<int> roomIds
-        )
-        {
+        ) {
             var output =
                 new Dictionary<int, List<((double row, double col), (double row, double col))>>();
-            foreach (var roomId in roomIds)
-            {
+            foreach (var roomId in roomIds) {
                 var roomWals = new List<((double row, double col), (double row, double col))>();
-                foreach (var k in boundaryGroups.Keys.Where(k => TupleContains(k, roomId)))
-                {
+                foreach (var k in boundaryGroups.Keys.Where(k => TupleContains(k, roomId))) {
                     roomWals.AddRange(boundaryGroups[k]);
                 }
                 var wallLoop = getWallLoop(roomWals);
                 var edgeSum = 0.0;
-                foreach (((double x0, double z0), (double x1, double z1)) in wallLoop)
-                {
+                foreach (((double x0, double z0), (double x1, double z1)) in wallLoop) {
                     var dist = x0 * z1 - x1 * z0;
                     edgeSum += dist;
                 }
-                if (edgeSum > 0)
-                {
+                if (edgeSum > 0) {
                     wallLoop = wallLoop
                         .Reverse<((double row, double col), (double row, double col))>()
                         .Select(p => (p.Item2, p.Item1))
@@ -908,13 +821,11 @@ IEnumerable<int> roomIds
             return output;
         }
 
-        public static string roomIntToId(int id, RoomHierarchy room)
-        {
+        public static string roomIntToId(int id, RoomHierarchy room) {
             return $"{room.id}{id}";
         }
 
-        public static string houseId()
-        {
+        public static string houseId() {
             return "house";
         }
 
@@ -922,35 +833,28 @@ public static string holeTemplateIdToHouseId(
             string holeTemplateId,
             int count = 0,
             string idPrefix = ""
-        )
-        {
+        ) {
             var name = string.IsNullOrEmpty(idPrefix) ? holeTemplateId : idPrefix;
             return count == 0 ? $"{name}" : $"{name}_{count}";
             // return $"{wallId}{holeId}{index}";
         }
 
-        public static string wallToId(int wallIndexInRoom, string roomId, string wallIdPrefix = "")
-        {
+        public static string wallToId(int wallIndexInRoom, string roomId, string wallIdPrefix = "") {
             return $"{roomId}_{wallIdPrefix}{wallIndexInRoom}";
         }
 
-        public static string objectToId(string objectId, int count = 0, string idPrefix = "")
-        {
+        public static string objectToId(string objectId, int count = 0, string idPrefix = "") {
             var name = string.IsNullOrEmpty(idPrefix) ? objectId : idPrefix;
             return count == 0 ? $"{name}" : $"{name}_{count}";
             // return count == 0 && string.IsNullOrEmpty(idPrefix) ? $"{objectId}" : $"{objectId}_{idPrefix}{count}";
         }
 
         public class DefaultDictionary<TKey, TValue> : Dictionary<TKey, TValue>
-            where TValue : new()
-        {
-            public new TValue this[TKey key]
-            {
-                get
-                {
+            where TValue : new() {
+            public new TValue this[TKey key] {
+                get {
                     TValue val;
-                    if (!TryGetValue(key, out val))
-                    {
+                    if (!TryGetValue(key, out val)) {
                         val = new TValue();
                         Add(key, val);
                     }
@@ -960,26 +864,20 @@ public class DefaultDictionary<TKey, TValue> : Dictionary<TKey, TValue>
             }
         }
 
-        public class CustomHashSetEqualityComparer<T> : IEqualityComparer<HashSet<T>>
-        {
-            public bool Equals(HashSet<T> x, HashSet<T> y)
-            {
-                if (ReferenceEquals(x, null))
-                {
+        public class CustomHashSetEqualityComparer<T> : IEqualityComparer<HashSet<T>> {
+            public bool Equals(HashSet<T> x, HashSet<T> y) {
+                if (ReferenceEquals(x, null)) {
                     return false;
                 }
 
                 return x.SetEquals(y);
             }
 
-            public int GetHashCode(HashSet<T> set)
-            {
+            public int GetHashCode(HashSet<T> set) {
                 int hashCode = 0;
 
-                if (set != null)
-                {
-                    foreach (T t in set)
-                    {
+                if (set != null) {
+                    foreach (T t in set) {
                         hashCode = hashCode ^ (set.Comparer.GetHashCode(t) & 0x7FFFFFFF);
                     }
                 }
@@ -987,8 +885,7 @@ public int GetHashCode(HashSet<T> set)
             }
         }
 
-        private static bool TupleContains((int, int) t, int id)
-        {
+        private static bool TupleContains((int, int) t, int id) {
             return t.Item1 == id || t.Item2 == id;
         }
     }
diff --git a/unity/Assets/Scripts/ProceduralTools.cs b/unity/Assets/Scripts/ProceduralTools.cs
index fe6d69a940..a1c7746a10 100644
--- a/unity/Assets/Scripts/ProceduralTools.cs
+++ b/unity/Assets/Scripts/ProceduralTools.cs
@@ -1778,8 +1778,7 @@ public static GameObject CreateHouse(
                 var cam = GameObject.Find("FirstPersonCharacter").GetComponent<Camera>();
                 cam.clearFlags = CameraClearFlags.SolidColor;
                 cam.backgroundColor = flatColor;
-            }
-            else {
+            } else {
                 RenderSettings.skybox = materialDb.getAsset(house.proceduralParameters.skyboxId);
             }
             DynamicGI.UpdateEnvironment();
diff --git a/unity/Assets/Scripts/RandomExtensions.cs b/unity/Assets/Scripts/RandomExtensions.cs
index 2f57b21748..f840127aaf 100644
--- a/unity/Assets/Scripts/RandomExtensions.cs
+++ b/unity/Assets/Scripts/RandomExtensions.cs
@@ -3,10 +3,8 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace RandomExtensions
-{
-    public static class RandomExtensions
-    {
+namespace RandomExtensions {
+    public static class RandomExtensions {
         /**
          * Generates normally distributed numbers. Each operation makes two Gaussians for the price of one,
          * and apparently they can be cached or something for better performance, but who cares.
@@ -14,8 +12,7 @@ public static class RandomExtensions
          * @param mu Mean of the distribution
          * @param sigma Standard deviation
          */
-        public static double NextGaussian(this Random r, double mu = 0, double sigma = 1)
-        {
+        public static double NextGaussian(this Random r, double mu = 0, double sigma = 1) {
             var u1 = r.NextDouble();
             var u2 = r.NextDouble();
             var rand_std_normal = Math.Sqrt(-2.0 * Math.Log(u1)) * Math.Sin(2.0 * Math.PI * u2);
@@ -27,8 +24,7 @@ public static double NextGaussian(this Random r, double mu = 0, double sigma = 1
                 Double.IsNaN(rand_normal)
                 || Double.IsInfinity(rand_normal)
                 || Double.IsNegativeInfinity(rand_normal)
-            )
-            {
+            ) {
                 return mu;
             }
 
diff --git a/unity/Assets/Scripts/Rearrangeable.cs b/unity/Assets/Scripts/Rearrangeable.cs
index 34883b4dae..3ff48e94b2 100644
--- a/unity/Assets/Scripts/Rearrangeable.cs
+++ b/unity/Assets/Scripts/Rearrangeable.cs
@@ -2,23 +2,19 @@
 using System.Collections;
 using UnityEngine;
 
-public enum FurniturePosition
-{
+public enum FurniturePosition {
     Undesirable,
     Desireable,
 }
 
 [ExecuteInEditMode]
-public class Rearrangeable : MonoBehaviour
-{
+public class Rearrangeable : MonoBehaviour {
     public bool EditorPos = false;
     public Transform StartPosition;
     public Transform EndPosition;
     public SimObj ParentSimObj;
-    public FurniturePosition Position
-    {
-        get
-        {
+    public FurniturePosition Position {
+        get {
             return ParentSimObj.Animator.GetBool("AnimState1")
                 ? FurniturePosition.Undesirable
                 : FurniturePosition.Desireable;
@@ -27,37 +23,29 @@ public FurniturePosition Position
 
     bool reportedError = false;
 
-    public void MoveTo(FurniturePosition state)
-    {
+    public void MoveTo(FurniturePosition state) {
         ParentSimObj.Animator.SetBool("AnimState1", state == FurniturePosition.Undesirable);
     }
 
-    void OnEnable()
-    {
-        if (!Application.isPlaying)
-        {
-            if (StartPosition == null)
-            {
+    void OnEnable() {
+        if (!Application.isPlaying) {
+            if (StartPosition == null) {
                 StartPosition = new GameObject(name + "_StartPosition").transform;
                 StartPosition.parent = transform.parent;
                 StartPosition.localPosition = transform.localPosition;
                 StartPosition.localRotation = transform.localRotation;
             }
-            if (EndPosition == null)
-            {
+            if (EndPosition == null) {
                 EndPosition = new GameObject(name + "_EndPosition").transform;
                 EndPosition.parent = transform.parent;
                 EndPosition.localPosition = transform.localPosition;
                 EndPosition.localRotation = transform.localRotation;
             }
-            if (ParentSimObj == null)
-            {
+            if (ParentSimObj == null) {
                 ParentSimObj = gameObject.GetComponent<SimObj>();
             }
-            if (ParentSimObj != null)
-            {
-                if (!ParentSimObj.IsAnimated)
-                {
+            if (ParentSimObj != null) {
+                if (!ParentSimObj.IsAnimated) {
                     Animator a = ParentSimObj.gameObject.AddComponent<Animator>();
                     a.runtimeAnimatorController =
                         Resources.Load("ToggleableAnimController") as RuntimeAnimatorController;
@@ -65,39 +53,30 @@ void OnEnable()
                     gameObject.SetActive(true);
                 }
             }
-        }
-        else
-        {
+        } else {
             MoveTo(FurniturePosition.Undesirable);
         }
     }
 
-    void Update()
-    {
-        if (ParentSimObj == null)
-        {
-            if (!reportedError)
-            {
+    void Update() {
+        if (ParentSimObj == null) {
+            if (!reportedError) {
                 reportedError = true;
                 Debug.LogError("Parent sim obj null in rearrangeable " + name);
             }
             return;
         }
 
-        if (!ParentSimObj.IsAnimated)
-        {
-            if (!reportedError)
-            {
+        if (!ParentSimObj.IsAnimated) {
+            if (!reportedError) {
                 reportedError = true;
                 Debug.LogError("Parent sim obj is not animated in rearrangeable " + name);
             }
             return;
         }
 
-        if (StartPosition == null || EndPosition == null)
-        {
-            if (!reportedError)
-            {
+        if (StartPosition == null || EndPosition == null) {
+            if (!reportedError) {
                 reportedError = true;
                 Debug.LogError("Start or end positions is null in rearrangeable " + name);
             }
@@ -105,33 +84,26 @@ void Update()
         }
 
         bool startPos = false;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             startPos = ParentSimObj.Animator.GetBool("AnimState1");
-        }
-        else
-        {
+        } else {
             startPos = EditorPos;
         }
         ParentSimObj.transform.position = startPos ? StartPosition.position : EndPosition.position;
         ParentSimObj.transform.rotation = startPos ? StartPosition.rotation : EndPosition.rotation;
     }
 
-    void OnDrawGizmos()
-    {
-        if (Application.isPlaying)
-        {
+    void OnDrawGizmos() {
+        if (Application.isPlaying) {
             return;
         }
 
-        if (ParentSimObj == null || StartPosition == null || EndPosition == null)
-        {
+        if (ParentSimObj == null || StartPosition == null || EndPosition == null) {
             return;
         }
 
         MeshFilter mf = ParentSimObj.GetComponentInChildren<MeshFilter>();
-        if (mf != null)
-        {
+        if (mf != null) {
             Gizmos.color = EditorPos
                 ? Color.Lerp(Color.red, Color.clear, 0.5f)
                 : Color.Lerp(Color.green, Color.clear, 0.5f);
diff --git a/unity/Assets/Scripts/Receptacle.cs b/unity/Assets/Scripts/Receptacle.cs
index 0155f5d815..a37ba48b0f 100644
--- a/unity/Assets/Scripts/Receptacle.cs
+++ b/unity/Assets/Scripts/Receptacle.cs
@@ -4,25 +4,19 @@
 
 [RequireComponent(typeof(SimObj))]
 [ExecuteInEditMode]
-public class Receptacle : MonoBehaviour
-{
+public class Receptacle : MonoBehaviour {
     public Collider VisibilityCollider;
     public Transform[] Pivots;
     public GameObject MessItem;
-    public bool IsClean
-    {
-        get
-        {
-            if (MessItem != null)
-            {
+    public bool IsClean {
+        get {
+            if (MessItem != null) {
                 return !MessItem.activeSelf;
             }
             return true;
         }
-        set
-        {
-            if (MessItem != null)
-            {
+        set {
+            if (MessItem != null) {
                 MessItem.SetActive(!value);
             }
         }
@@ -31,10 +25,8 @@ public bool IsClean
     private SimObj[] startupItems;
     private Vector3 lastPosition;
 
-    protected virtual void OnEnable()
-    {
-        if (VisibilityCollider == null)
-        {
+    protected virtual void OnEnable() {
+        if (VisibilityCollider == null) {
             Debug.LogError(
                 "Visibility collider is not set on receptacle " + name + " - this should not happen"
             );
@@ -45,26 +37,20 @@ protected virtual void OnEnable()
         // leave other colliders alone
         VisibilityCollider.tag = SimUtil.ReceptacleTag;
 
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             // un-parent all parented sim objs temporarily
             // this way any sim objs we're holding can grab their colliders
             startupItems = new SimObj[Pivots.Length];
-            for (int i = 0; i < Pivots.Length; i++)
-            {
-                if (Pivots[i].childCount > 0)
-                {
+            for (int i = 0; i < Pivots.Length; i++) {
+                if (Pivots[i].childCount > 0) {
                     startupItems[i] = Pivots[i].GetChild(0).GetComponent<SimObj>();
-                    if (startupItems[i] == null)
-                    {
+                    if (startupItems[i] == null) {
                         Debug.LogError(
                             "Found a non-SimObj child in a receptacle "
                                 + name
                                 + " pivot - this should not happen"
                         );
-                    }
-                    else
-                    {
+                    } else {
                         startupItems[i].transform.parent = null;
                     }
                 }
@@ -72,32 +58,26 @@ protected virtual void OnEnable()
 
             // see if we have more than 1 collider - if we do, make the visibility collider a trigger
             Collider[] colliders = gameObject.GetComponentsInChildren<Collider>();
-            if (colliders.Length > 1)
-            {
+            if (colliders.Length > 1) {
                 VisibilityCollider.isTrigger = true;
             }
         }
     }
 
-    protected void Start()
-    {
-        if (Application.isPlaying)
-        {
+    protected void Start() {
+        if (Application.isPlaying) {
             // now that all sim objs have updated themselves
             // re-parent all children of pivots
             // and set any sim objs to invisible
-            for (int i = 0; i < Pivots.Length; i++)
-            {
-                if (startupItems[i] != null)
-                {
+            for (int i = 0; i < Pivots.Length; i++) {
+                if (startupItems[i] != null) {
                     startupItems[i].transform.parent = Pivots[i];
                     startupItems[i].transform.localPosition = Vector3.zero;
                     startupItems[i].transform.localRotation = Quaternion.identity;
                     startupItems[i].VisibleToRaycasts = false;
                     // if the item starts in a receptacle, it has no 'startup position'
                     // so destroy its startup transform
-                    if (startupItems[i].StartupTransform != null)
-                    {
+                    if (startupItems[i].StartupTransform != null) {
                         GameObject.Destroy(startupItems[i].StartupTransform.gameObject);
                     }
                 }
@@ -105,12 +85,9 @@ protected void Start()
         }
     }
 
-    void OnDrawGizmos()
-    {
-        if (Pivots != null && Pivots.Length > 0)
-        {
-            foreach (Transform pivot in Pivots)
-            {
+    void OnDrawGizmos() {
+        if (Pivots != null && Pivots.Length > 0) {
+            foreach (Transform pivot in Pivots) {
                 Gizmos.color = Color.Lerp(Color.cyan, Color.clear, 0.5f);
                 Gizmos.DrawCube(pivot.position, Vector3.one * 0.05f);
                 Gizmos.color = Color.green;
diff --git a/unity/Assets/Scripts/ResourceAssetManager.cs b/unity/Assets/Scripts/ResourceAssetManager.cs
index ab272b7a29..9541854540 100644
--- a/unity/Assets/Scripts/ResourceAssetManager.cs
+++ b/unity/Assets/Scripts/ResourceAssetManager.cs
@@ -6,38 +6,31 @@
 using UnityEngine;
 
 public class ResourceAssetReference<T>
-    where T : UnityEngine.Object
-{
+    where T : UnityEngine.Object {
     public readonly string Name;
     public readonly string ResourcePath;
     private T _asset;
 
-    public ResourceAssetReference(string resourcePath, string name)
-    {
+    public ResourceAssetReference(string resourcePath, string name) {
         this.Name = name;
         this.ResourcePath = resourcePath;
     }
 
-    public T Load()
-    {
-        if (this._asset == null)
-        {
+    public T Load() {
+        if (this._asset == null) {
             this._asset = Resources.Load<T>(ResourcePath);
         }
         return this._asset;
     }
 }
 
-public class ResourceAssetManager
-{
-    private class ResourceAsset
-    {
+public class ResourceAssetManager {
+    private class ResourceAsset {
         // must have empty constructor for JSON deserialization
         public ResourceAsset() { }
 
 #if UNITY_EDITOR
-        public ResourceAsset(string assetPath)
-        {
+        public ResourceAsset(string assetPath) {
             var asset = AssetDatabase.LoadMainAssetAtPath(assetPath);
             this.path = assetPath;
             this.labels = AssetDatabase.GetLabels(asset);
@@ -52,10 +45,8 @@ public ResourceAsset(string assetPath)
         public string name;
     }
 
-    private class ResourceAssetCatalog
-    {
-        public ResourceAssetCatalog()
-        {
+    private class ResourceAssetCatalog {
+        public ResourceAssetCatalog() {
             this.assets = new List<ResourceAsset>();
             this.timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
         }
@@ -71,8 +62,7 @@ public ResourceAssetCatalog()
     private Dictionary<string, List<ResourceAsset>> labelIndex =
         new Dictionary<string, List<ResourceAsset>>();
 
-    public ResourceAssetManager()
-    {
+    public ResourceAssetManager() {
 #if UNITY_EDITOR
         this.RefreshCatalog();
 #else
@@ -87,24 +77,20 @@ public ResourceAssetManager()
 
 #if UNITY_EDITOR
 
-    private string[] findResourceGuids()
-    {
+    private string[] findResourceGuids() {
         return AssetDatabase.FindAssets("t:material", new[] { "Assets/Resources" });
     }
 
-    public void RefreshCatalog()
-    {
+    public void RefreshCatalog() {
         this.catalog = new ResourceAssetCatalog();
-        foreach (string guid in this.findResourceGuids())
-        {
+        foreach (string guid in this.findResourceGuids()) {
             // GUIDToAssetPath returns a relative path e.g "Assets/Resources/QuickMaterials/Blue.mat"
             var assetPath = AssetDatabase.GUIDToAssetPath(guid);
             // ignore FBX files with multiple sub-materials
             if (
                 assetPath.ToLower().EndsWith(".fbx")
                 && AssetDatabase.LoadAllAssetsAtPath(assetPath).Length > 1
-            )
-            {
+            ) {
                 continue;
             }
 
@@ -114,21 +100,16 @@ public void RefreshCatalog()
         this.generateLabelIndex();
     }
 
-    public void BuildCatalog()
-    {
+    public void BuildCatalog() {
         this.RefreshCatalog();
         this.writeCatalog();
     }
 #endif
 
-    private void generateLabelIndex()
-    {
-        foreach (var labeledAsset in this.catalog.assets)
-        {
-            foreach (var label in labeledAsset.labels)
-            {
-                if (!this.labelIndex.ContainsKey(label))
-                {
+    private void generateLabelIndex() {
+        foreach (var labeledAsset in this.catalog.assets) {
+            foreach (var label in labeledAsset.labels) {
+                if (!this.labelIndex.ContainsKey(label)) {
                     this.labelIndex[label] = new List<ResourceAsset>();
                 }
                 this.labelIndex[label].Add(labeledAsset);
@@ -136,11 +117,9 @@ private void generateLabelIndex()
         }
     }
 
-    private ResourceAssetCatalog readCatalog()
-    {
+    private ResourceAssetCatalog readCatalog() {
         string catalogResourcePath = relativePath(ResourcesPath, CatalogPath);
-        if (Path.HasExtension(catalogResourcePath))
-        {
+        if (Path.HasExtension(catalogResourcePath)) {
             string ext = Path.GetExtension(catalogResourcePath);
             catalogResourcePath = catalogResourcePath.Remove(
                 catalogResourcePath.Length - ext.Length,
@@ -149,8 +128,7 @@ private ResourceAssetCatalog readCatalog()
         }
         var jsonResource = Resources.Load<TextAsset>(catalogResourcePath);
 
-        if (jsonResource == null)
-        {
+        if (jsonResource == null) {
             return null;
         }
 
@@ -158,25 +136,21 @@ private ResourceAssetCatalog readCatalog()
     }
 
     // just handles case where relativeTo is the prefix of fullPath
-    private string relativePath(string relativeTo, string fullPath)
-    {
+    private string relativePath(string relativeTo, string fullPath) {
         return fullPath.Remove(0, relativeTo.Length);
     }
 
-    private void writeCatalog()
-    {
+    private void writeCatalog() {
         string json = serialize(this.catalog);
 
         // .tmp files are ignored by Unity under Assets/
         string tmpCatalogPath = CatalogPath + ".tmp";
-        if (File.Exists(tmpCatalogPath))
-        {
+        if (File.Exists(tmpCatalogPath)) {
             File.Delete(tmpCatalogPath);
         }
 
         File.WriteAllText(tmpCatalogPath, json);
-        if (File.Exists(CatalogPath))
-        {
+        if (File.Exists(CatalogPath)) {
             File.Delete(CatalogPath);
         }
         // Doing a delete + move to make the write atomic and avoid writing a possibly invalid JSON
@@ -185,16 +159,12 @@ private void writeCatalog()
     }
 
     public List<ResourceAssetReference<T>> FindResourceAssetReferences<T>(string label)
-        where T : UnityEngine.Object
-    {
+        where T : UnityEngine.Object {
         string typeName = typeof(T).FullName;
         List<ResourceAssetReference<T>> assetRefs = new List<ResourceAssetReference<T>>();
-        if (this.labelIndex.ContainsKey(label))
-        {
-            foreach (var res in this.labelIndex[label])
-            {
-                if (res.assetType == typeName)
-                {
+        if (this.labelIndex.ContainsKey(label)) {
+            foreach (var res in this.labelIndex[label]) {
+                if (res.assetType == typeName) {
                     string resourcePath = relativePath("Assets/Resources/", res.path);
                     resourcePath = Path.Combine(
                         Path.GetDirectoryName(resourcePath),
@@ -209,21 +179,17 @@ public List<ResourceAssetReference<T>> FindResourceAssetReferences<T>(string lab
             }
 
             return assetRefs;
-        }
-        else
-        {
+        } else {
             return assetRefs;
         }
     }
 
-    private string serialize(ResourceAssetCatalog catalog)
-    {
+    private string serialize(ResourceAssetCatalog catalog) {
         var jsonResolver = new ShouldSerializeContractResolver();
         return Newtonsoft.Json.JsonConvert.SerializeObject(
             catalog,
             Newtonsoft.Json.Formatting.None,
-            new Newtonsoft.Json.JsonSerializerSettings()
-            {
+            new Newtonsoft.Json.JsonSerializerSettings() {
                 ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore,
                 ContractResolver = jsonResolver
             }
diff --git a/unity/Assets/Scripts/RobotArmTest/Adjust_Slider.cs b/unity/Assets/Scripts/RobotArmTest/Adjust_Slider.cs
index 686eb0d014..e5ef9cef0d 100644
--- a/unity/Assets/Scripts/RobotArmTest/Adjust_Slider.cs
+++ b/unity/Assets/Scripts/RobotArmTest/Adjust_Slider.cs
@@ -2,30 +2,24 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Adjust_Slider : MonoBehaviour
-{
+public class Adjust_Slider : MonoBehaviour {
     public Transform robotArmRoot;
     Vector3 localStartingPoint;
     float minThreshold = -0.32f;
     float maxThreshold = 0.15f;
 
-    void Start()
-    {
+    void Start() {
         localStartingPoint = this.transform.localPosition;
     }
 
-    void Update()
-    {
-        if (robotArmRoot.localPosition.y < minThreshold)
-        {
+    void Update() {
+        if (robotArmRoot.localPosition.y < minThreshold) {
             this.transform.localPosition = new Vector3(
                 this.transform.localPosition.x,
                 localStartingPoint.y - Mathf.Abs(robotArmRoot.localPosition.y - minThreshold),
                 this.transform.localPosition.z
             );
-        }
-        else if (robotArmRoot.localPosition.y > maxThreshold)
-        {
+        } else if (robotArmRoot.localPosition.y > maxThreshold) {
             this.transform.localPosition = new Vector3(
                 this.transform.localPosition.x,
                 localStartingPoint.y + Mathf.Abs(robotArmRoot.localPosition.y - maxThreshold),
diff --git a/unity/Assets/Scripts/RobotArmTest/Align_to_Joint_Normal.cs b/unity/Assets/Scripts/RobotArmTest/Align_to_Joint_Normal.cs
index 91817bc88f..1581969b15 100644
--- a/unity/Assets/Scripts/RobotArmTest/Align_to_Joint_Normal.cs
+++ b/unity/Assets/Scripts/RobotArmTest/Align_to_Joint_Normal.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Align_to_Joint_Normal : MonoBehaviour
-{
+public class Align_to_Joint_Normal : MonoBehaviour {
     public Transform root;
     public Transform mid;
     public Transform tip;
@@ -14,19 +13,15 @@ public class Align_to_Joint_Normal : MonoBehaviour
         jointTangent;
     Transform positionAlignedJoint;
 
-    void Update()
-    {
+    void Update() {
         joint1 = mid.position - root.position;
         joint2 = tip.position - mid.position;
         jointNormal = Vector3.Cross(joint1, joint2);
 
-        if (isMidJointAngler == true)
-        {
+        if (isMidJointAngler == true) {
             positionAlignedJoint = tip;
             jointTangent = Vector3.Cross(joint2, jointNormal);
-        }
-        else
-        {
+        } else {
             positionAlignedJoint = mid;
             jointTangent = Vector3.Cross(joint1, jointNormal);
         }
diff --git a/unity/Assets/Scripts/RobotArmTest/FK_IK_Solver.cs b/unity/Assets/Scripts/RobotArmTest/FK_IK_Solver.cs
index d91b6f1f9f..4a7cf5950c 100644
--- a/unity/Assets/Scripts/RobotArmTest/FK_IK_Solver.cs
+++ b/unity/Assets/Scripts/RobotArmTest/FK_IK_Solver.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class FK_IK_Solver : MonoBehaviour
-{
+public class FK_IK_Solver : MonoBehaviour {
     public bool isIKDriven;
     public Transform armRoot,
         armShoulder,
@@ -43,8 +42,7 @@ public class FK_IK_Solver : MonoBehaviour
         elbowPosition;
 
     // this must be Awake vs Start since when the Arm is activated, Start() will not have been called
-    void Awake()
-    {
+    void Awake() {
         bone1Length = (armShoulder.position - armRoot.position).magnitude;
         bone2Length = (armElbow.position - armShoulder.position).magnitude;
         bone3Length = (armWrist.position - armElbow.position).magnitude;
@@ -53,17 +51,14 @@ void Awake()
 
 #if UNITY_EDITOR
     // Uncomment this when testing in Unity
-    void Update()
-    {
+    void Update() {
         ManipulateArm();
     }
 #endif
 
-    public void ManipulateArm()
-    {
+    public void ManipulateArm() {
         // Check if arm is driven by IK or FK
-        if (isIKDriven == true)
-        {
+        if (isIKDriven == true) {
             // Adjust pole position
             IKPole.parent.position = IKTarget.position;
             IKPole.parent.forward = IKTarget.position - armShoulder.position;
@@ -72,8 +67,7 @@ public void ManipulateArm()
             if (
                 (IKTarget.position - armShoulder.position).sqrMagnitude
                 < Mathf.Pow(bone2Length + bone3Length - 1e-5f, 2)
-            )
-            {
+            ) {
                 // Define variables to optimize logic
                 p1x = armShoulder.position.x;
                 p1y = armShoulder.position.y;
@@ -142,17 +136,13 @@ public void ManipulateArm()
                 armElbow.position = elbowPosition;
                 armWrist.position = IKTarget.position;
                 armWrist.rotation = IKTarget.rotation;
-            }
-            else
-            {
+            } else {
                 Vector3 armDirectionVector = (IKTarget.position - armShoulder.position).normalized;
                 armElbow.position = armShoulder.position + armDirectionVector * bone1Length;
                 armWrist.position = armElbow.position + armDirectionVector * bone2Length;
                 armWrist.rotation = IKTarget.rotation;
             }
-        }
-        else
-        {
+        } else {
             armRoot.position = FKRootTarget.position;
             armRoot.rotation = FKRootTarget.rotation;
             armShoulder.position = FKShoulderTarget.position;
@@ -172,8 +162,7 @@ public void ManipulateArm()
         AlignToJointNormal(armWrist.GetChild(0), armElbow, armWrist, armHand, true);
     }
 
-    float FindParameter(float p0x, float p0y, float p0z, float a, float b, float c, float d)
-    {
+    float FindParameter(float p0x, float p0y, float p0z, float a, float b, float c, float d) {
         float parameter =
             (d - a * p0x - b * p0y - c * p0z)
             / (Mathf.Pow(a, 2) + Mathf.Pow(b, 2) + Mathf.Pow(c, 2));
@@ -186,8 +175,7 @@ void AlignToJointNormal(
         Transform mid,
         Transform tip,
         bool isMidJointAngled
-    )
-    {
+    ) {
         Vector3 bone1 = mid.position - root.position;
         Vector3 bone2 = tip.position - mid.position;
         Vector3 jointNormal = Vector3.Cross(bone1, bone2);
@@ -195,13 +183,10 @@ bool isMidJointAngled
 
         Transform positionAlignedJoint;
 
-        if (isMidJointAngled == true)
-        {
+        if (isMidJointAngled == true) {
             positionAlignedJoint = tip;
             jointTangent = Vector3.Cross(bone2, jointNormal);
-        }
-        else
-        {
+        } else {
             positionAlignedJoint = mid;
             jointTangent = Vector3.Cross(bone1, jointNormal);
         }
diff --git a/unity/Assets/Scripts/RobotArmTest/Manipulator_Clamp.cs b/unity/Assets/Scripts/RobotArmTest/Manipulator_Clamp.cs
index 0a49e46de1..daa07e3475 100644
--- a/unity/Assets/Scripts/RobotArmTest/Manipulator_Clamp.cs
+++ b/unity/Assets/Scripts/RobotArmTest/Manipulator_Clamp.cs
@@ -3,8 +3,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Manipulator_Clamp : MonoBehaviour
-{
+public class Manipulator_Clamp : MonoBehaviour {
     Vector3[] currentCoordinates = new Vector3[2];
     Vector3[] prevCoordinates = new Vector3[2];
     Transform rootJoint;
@@ -13,42 +12,34 @@ public class Manipulator_Clamp : MonoBehaviour
     Vector3 rootToShoulder;
     Vector3 shoulderToWrist;
 
-    void Start()
-    {
+    void Start() {
         currentCoordinates[0] = transform.position;
         currentCoordinates[1] = transform.eulerAngles;
         prevCoordinates = currentCoordinates;
 
-        foreach (Transform transform in transform.parent.parent.parent)
-        {
-            if (transform.name == "robot_arm_1_jnt")
-            {
+        foreach (Transform transform in transform.parent.parent.parent) {
+            if (transform.name == "robot_arm_1_jnt") {
                 rootJoint = transform;
             }
         }
 
-        foreach (Transform transform in rootJoint)
-        {
-            if (transform.name == "robot_arm_2_jnt")
-            {
+        foreach (Transform transform in rootJoint) {
+            if (transform.name == "robot_arm_2_jnt") {
                 shoulderJoint = transform;
             }
         }
     }
 
-    void Update()
-    {
+    void Update() {
         // Debug.Log("Checking for hemisphere change!");
-        if (transform.position != prevCoordinates[0])
-        {
+        if (transform.position != prevCoordinates[0]) {
             // Clamp to front hemisphere
             rootToWrist = rootJoint.InverseTransformPoint(transform.position);
 
             // Debug.Log("Z from " + rootJoint.gameObject.name + " to " + transform.gameObject.name + ": " + rootToWrist);
             rootToShoulder = shoulderJoint.localPosition;
             // Debug.Log("Z from " + rootJoint.gameObject.name + " to shoulder: " + shoulderJoint.gameObject.name + ": " + rootToShoulder);
-            if (rootToWrist.z - 0.01f <= rootToShoulder.z)
-            {
+            if (rootToWrist.z - 0.01f <= rootToShoulder.z) {
                 Debug.Log("Wrist is behind shoulder!");
                 transform.position += rootJoint.TransformDirection(
                     Vector3.forward * (rootToShoulder.z - rootToWrist.z + 0.01f)
@@ -60,8 +51,7 @@ void Update()
             // Maximum shoulder-to-wrist length is ~0.6335!!!
             shoulderToWrist = rootToWrist - rootToShoulder;
             // Debug.Log(shoulderToWrist.magnitude + " vs " + shoulderJoint.InverseTransformPoint(transform.position).magnitude);
-            if (shoulderToWrist.sqrMagnitude >= Mathf.Pow(0.6335f, 2) && shoulderToWrist.z > 0)
-            {
+            if (shoulderToWrist.sqrMagnitude >= Mathf.Pow(0.6335f, 2) && shoulderToWrist.z > 0) {
                 // Debug.Log("Arm is overreaching!");
                 transform.position += rootJoint.TransformDirection(
                     (shoulderToWrist.normalized * 0.6325f) - shoulderToWrist
diff --git a/unity/Assets/Scripts/RobotArmTest/Stretch_Arm_Solver.cs b/unity/Assets/Scripts/RobotArmTest/Stretch_Arm_Solver.cs
index 5479a2f062..415f5a35ee 100644
--- a/unity/Assets/Scripts/RobotArmTest/Stretch_Arm_Solver.cs
+++ b/unity/Assets/Scripts/RobotArmTest/Stretch_Arm_Solver.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Stretch_Arm_Solver : MonoBehaviour
-{
+public class Stretch_Arm_Solver : MonoBehaviour {
     public Transform armRoot,
         armTarget;
     Transform arm1,
@@ -21,14 +20,12 @@ public class Stretch_Arm_Solver : MonoBehaviour
         frontArmExtensionLimit = 0.516f;
 
 #if UNITY_EDITOR
-    void Update()
-    {
+    void Update() {
         ManipulateStretchArm();
     }
 #endif
 
-    public void ManipulateStretchArm()
-    {
+    public void ManipulateStretchArm() {
         arm1 = armRoot.GetChild(0);
         arm2 = arm1.GetChild(0);
         arm3 = arm2.GetChild(0);
diff --git a/unity/Assets/Scripts/RoomProperties.cs b/unity/Assets/Scripts/RoomProperties.cs
index b3914a86ad..fb7e0d5843 100644
--- a/unity/Assets/Scripts/RoomProperties.cs
+++ b/unity/Assets/Scripts/RoomProperties.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class RoomProperties : MonoBehaviour
-{
+public class RoomProperties : MonoBehaviour {
     // TODO make an enum once we have a final set of room types
     //public enum RoomType {}
     public string RoomType;
diff --git a/unity/Assets/Scripts/RuntimePrefab.cs b/unity/Assets/Scripts/RuntimePrefab.cs
index 8c93dbdf2e..5155bd59e5 100644
--- a/unity/Assets/Scripts/RuntimePrefab.cs
+++ b/unity/Assets/Scripts/RuntimePrefab.cs
@@ -11,8 +11,7 @@
 #endif
 
 [ExecuteInEditMode]
-public class RuntimePrefab : MonoBehaviour
-{
+public class RuntimePrefab : MonoBehaviour {
     // Textures for runtime objects are stored on disk
     // so that they can easily be used across builds,
     // and do not make the build size massive. Here,
@@ -30,11 +29,9 @@ public class RuntimePrefab : MonoBehaviour
     // the texture again, since they can share it.
     public Material sharedMaterial;
 
-    Texture2D SwapChannelsRGBAtoRRRB(Texture2D originalTexture)
-    {
+    Texture2D SwapChannelsRGBAtoRRRB(Texture2D originalTexture) {
         Color[] pixels = originalTexture.GetPixels();
-        for (int i = 0; i < pixels.Length; i++)
-        {
+        for (int i = 0; i < pixels.Length; i++) {
             Color temp = pixels[i];
             pixels[i] = new Color(temp.r, temp.r, temp.r, temp.b); // Swap R and B
         }
@@ -45,14 +42,11 @@ Texture2D SwapChannelsRGBAtoRRRB(Texture2D originalTexture)
         return newTexture;
     }
 
-    private void reloadtextures()
-    {
+    private void reloadtextures() {
         GameObject mesh = transform.Find("mesh").gameObject;
         // load the texture from disk
-        if (!string.IsNullOrEmpty(albedoTexturePath))
-        {
-            if (sharedMaterial.mainTexture == null)
-            {
+        if (!string.IsNullOrEmpty(albedoTexturePath)) {
+            if (sharedMaterial.mainTexture == null) {
                 byte[] imageBytes = File.ReadAllBytes(albedoTexturePath);
                 Texture2D tex = new Texture2D(2, 2);
                 tex.LoadImage(imageBytes);
@@ -60,21 +54,18 @@ private void reloadtextures()
             }
         }
 
-        if (!string.IsNullOrEmpty(metallicSmoothnessTexturePath))
-        {
+        if (!string.IsNullOrEmpty(metallicSmoothnessTexturePath)) {
             sharedMaterial.EnableKeyword("_METALLICGLOSSMAP");
             byte[] imageBytes = File.ReadAllBytes(metallicSmoothnessTexturePath);
             Texture2D tex = new Texture2D(2, 2);
             tex.LoadImage(imageBytes);
-            if (metallicSmoothnessTexturePath.ToLower().EndsWith(".jpg"))
-            {
+            if (metallicSmoothnessTexturePath.ToLower().EndsWith(".jpg")) {
                 tex = SwapChannelsRGBAtoRRRB(tex);
             }
             sharedMaterial.SetTexture("_MetallicGlossMap", tex);
         }
 
-        if (!string.IsNullOrEmpty(normalTexturePath))
-        {
+        if (!string.IsNullOrEmpty(normalTexturePath)) {
             sharedMaterial.EnableKeyword("_NORMALMAP");
             byte[] imageBytes = File.ReadAllBytes(normalTexturePath);
             Texture2D tex = new Texture2D(2, 2);
@@ -82,8 +73,7 @@ private void reloadtextures()
             sharedMaterial.SetTexture("_BumpMap", tex);
         }
 
-        if (!string.IsNullOrEmpty(emissionTexturePath))
-        {
+        if (!string.IsNullOrEmpty(emissionTexturePath)) {
             sharedMaterial.globalIlluminationFlags =
                 MaterialGlobalIlluminationFlags.RealtimeEmissive;
             sharedMaterial.EnableKeyword("_EMISSION");
@@ -95,15 +85,13 @@ private void reloadtextures()
         }
     }
 
-    public void Awake()
-    {
+    public void Awake() {
         reloadtextures();
     }
 
 #if UNITY_EDITOR
     [Button(Expanded = true)]
-    public void RealoadTextures()
-    {
+    public void RealoadTextures() {
         reloadtextures();
     }
 
diff --git a/unity/Assets/Scripts/SceneManager.cs b/unity/Assets/Scripts/SceneManager.cs
index a83492bf02..ea4ccab543 100644
--- a/unity/Assets/Scripts/SceneManager.cs
+++ b/unity/Assets/Scripts/SceneManager.cs
@@ -9,14 +9,10 @@
 #endif
 
 [ExecuteInEditMode]
-public class SceneManager : MonoBehaviour
-{
-    public static SceneManager Current
-    {
-        get
-        {
-            if (current == null)
-            {
+public class SceneManager : MonoBehaviour {
+    public static SceneManager Current {
+        get {
+            if (current == null) {
                 current = GameObject.FindObjectOfType<SceneManager>();
             }
             return current;
@@ -54,13 +50,11 @@ public static SceneManager Current
 
     public List<SimObj> ObjectsInScene = new List<SimObj>();
 
-    void OnEnable()
-    {
+    void OnEnable() {
         GatherSimObjsInScene();
 
 #if UNITY_EDITOR
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             SetUpParents();
             SetUpFPSController();
             SetUpNavigation();
@@ -72,8 +66,7 @@ void OnEnable()
     }
 
     // generates a object ID for a sim object
-    public void AssignObjectID(SimObj obj)
-    {
+    public void AssignObjectID(SimObj obj) {
         // object ID is a string consisting of:
         //[SimObjType]_[X0.00]:[Y0.00]:[Z0.00]
         Vector3 pos = obj.transform.position;
@@ -83,24 +76,20 @@ public void AssignObjectID(SimObj obj)
         obj.ObjectID = obj.Type.ToString() + "|" + xPos + "|" + yPos + "|" + zPos;
     }
 
-    public void GatherSimObjsInScene()
-    {
+    public void GatherSimObjsInScene() {
         ObjectsInScene = new List<SimObj>();
         ObjectsInScene.AddRange(GameObject.FindObjectsOfType<SimObj>());
         ObjectsInScene.Sort((x, y) => (x.Type.ToString().CompareTo(y.Type.ToString())));
-        foreach (SimObj o in ObjectsInScene)
-        {
+        foreach (SimObj o in ObjectsInScene) {
             AssignObjectID(o);
         }
     }
 
 #if UNITY_EDITOR
     // returns an array of required types NOT found in scene
-    public SimObjType[] CheckSceneForRequiredTypes()
-    {
+    public SimObjType[] CheckSceneForRequiredTypes() {
         List<SimObjType> typesToCheck = null;
-        switch (LocalSceneType)
-        {
+        switch (LocalSceneType) {
             case SceneType.Kitchen:
             default:
                 typesToCheck = new List<SimObjType>(RequiredObjectTypes);
@@ -118,15 +107,13 @@ public SimObjType[] CheckSceneForRequiredTypes()
                 typesToCheck = new List<SimObjType>(RequiredTypesBathroom);
                 break;
         }
-        foreach (SimObj obj in ObjectsInScene)
-        {
+        foreach (SimObj obj in ObjectsInScene) {
             typesToCheck.Remove(obj.Type);
         }
         return typesToCheck.ToArray();
     }
 
-    public void SetUpParents()
-    {
+    public void SetUpParents() {
         FindOrCreateParent(ref ObjectsParent, ObjectsParentName);
         FindOrCreateParent(ref ControlsParent, ControlsParentName);
         FindOrCreateParent(ref LightingParent, LightingParentName);
@@ -134,30 +121,22 @@ public void SetUpParents()
         FindOrCreateParent(ref TargetsParent, TargetsParentName);
     }
 
-    public void AutoStructureNavigation()
-    {
+    public void AutoStructureNavigation() {
         Transform[] transforms = StructureParent.GetComponentsInChildren<Transform>();
         // take a wild guess that floor will be floor and ceiling will be ceiling
-        foreach (Transform t in transforms)
-        {
-            if (t.name.Contains("Ceiling"))
-            {
+        foreach (Transform t in transforms) {
+            if (t.name.Contains("Ceiling")) {
                 // set it to not walkable
                 GameObjectUtility.SetNavMeshArea(t.gameObject, PlacementManager.NavemeshNoneArea);
-            }
-            else if (t.name.Contains("Floor"))
-            {
+            } else if (t.name.Contains("Floor")) {
                 // set it to floor
                 GameObjectUtility.SetNavMeshArea(t.gameObject, PlacementManager.NavmeshFloorArea);
-            }
-            else
-            {
+            } else {
                 // if it's not already set to none (ie sittable objects) set it to 'shelves'
                 if (
                     GameObjectUtility.GetNavMeshArea(t.gameObject)
                     != PlacementManager.NavemeshNoneArea
-                )
-                {
+                ) {
                     GameObjectUtility.SetNavMeshArea(
                         t.gameObject,
                         PlacementManager.NavmeshShelfArea
@@ -171,18 +150,15 @@ public void AutoStructureNavigation()
         }
     }
 
-    public void GatherObjectsUnderParents()
-    {
+    public void GatherObjectsUnderParents() {
         SetUpParents();
 
         // move everything under structure by default
         // then move things to other folders based on their tags or type
         SimObj[] simObjs = GameObject.FindObjectsOfType<SimObj>();
-        foreach (SimObj o in simObjs)
-        {
+        foreach (SimObj o in simObjs) {
             Receptacle r = o.transform.GetComponentInParent<Receptacle>();
-            if (r == null || r.gameObject == o.gameObject)
-            {
+            if (r == null || r.gameObject == o.gameObject) {
                 o.transform.parent = ObjectsParent;
             }
         }
@@ -190,8 +166,7 @@ public void GatherObjectsUnderParents()
         GameObject[] rootObjects = UnityEngine
             .SceneManagement.SceneManager.GetActiveScene()
             .GetRootGameObjects();
-        foreach (GameObject rootObject in rootObjects)
-        {
+        foreach (GameObject rootObject in rootObjects) {
             // make sure it's not a parent
             if (
                 rootObject != gameObject
@@ -201,60 +176,49 @@ public void GatherObjectsUnderParents()
                 && rootObject.transform != TargetsParent
                 && rootObject.transform != ControlsParent
                 && rootObject.name != FPSControllerPrefab.name
-            )
-            {
+            ) {
                 rootObject.transform.parent = StructureParent;
                 EditorUtility.SetDirty(rootObject);
             }
         }
 
         ReflectionProbe[] probes = GameObject.FindObjectsOfType<ReflectionProbe>();
-        foreach (ReflectionProbe p in probes)
-        {
+        foreach (ReflectionProbe p in probes) {
             p.transform.parent = LightingParent;
         }
         Light[] lights = GameObject.FindObjectsOfType<Light>();
-        foreach (Light l in lights)
-        {
+        foreach (Light l in lights) {
             // TODO specify whether to gather prefab lights
 
             // if it's NOT in a prefab, move it
-            if (PrefabUtility.GetCorrespondingObjectFromSource(l.gameObject) == null)
-            {
+            if (PrefabUtility.GetCorrespondingObjectFromSource(l.gameObject) == null) {
                 l.transform.parent = LightingParent;
             }
         }
         // tag all the structure colliders
         Collider[] cols = StructureParent.GetComponentsInChildren<Collider>();
-        foreach (Collider c in cols)
-        {
+        foreach (Collider c in cols) {
             c.tag = "Structure";
             c.gameObject.layer = SimUtil.RaycastVisibleLayer;
         }
         // set all structure transforms to static
         Transform[] transforms = StructureParent.GetComponentsInChildren<Transform>();
-        foreach (Transform tr in transforms)
-        {
+        foreach (Transform tr in transforms) {
             tr.gameObject.isStatic = true;
             GameObjectUtility.SetStaticEditorFlags(tr.gameObject, StaticEditorFlags.BatchingStatic);
         }
     }
 
-    public void ReplaceGenerics()
-    {
+    public void ReplaceGenerics() {
         SimObj[] simObjs = GameObject.FindObjectsOfType<SimObj>();
-        foreach (SimObj generic in simObjs)
-        {
-            foreach (SimObj platonic in PlatonicPrefabs)
-            {
-                if (generic.Type == platonic.Type)
-                {
+        foreach (SimObj generic in simObjs) {
+            foreach (SimObj platonic in PlatonicPrefabs) {
+                if (generic.Type == platonic.Type) {
                     // make sure one isn't a prefab of the other
                     GameObject prefab =
                         PrefabUtility.GetCorrespondingObjectFromSource(generic.gameObject)
                         as GameObject;
-                    if (prefab == null || prefab != platonic.gameObject)
-                    {
+                    if (prefab == null || prefab != platonic.gameObject) {
                         Debug.Log("Replacing " + generic.name + " with " + platonic.name);
                         // as long as it's not a prefab, swap it out with the prefab
                         GameObject newSimObj =
@@ -272,8 +236,7 @@ public void ReplaceGenerics()
         }
     }
 
-    public void SetUpLighting()
-    {
+    public void SetUpLighting() {
         // thanks for not exposing these props, Unity :P
         // this may break in later versions
         var getLightmapSettingsMethod = typeof(LightmapEditorSettings).GetMethod(
@@ -297,8 +260,7 @@ public void SetUpLighting()
         settingsObject.ApplyModifiedProperties();
     }
 
-    public void SetUpNavigation()
-    {
+    public void SetUpNavigation() {
         // thanks for not exposing these props, Unity :P
         // this may break in later versions
         SerializedObject settingsObject = new SerializedObject(
@@ -324,34 +286,26 @@ public void SetUpNavigation()
         settingsObject.ApplyModifiedProperties();
     }
 
-    public void SetUpFPSController()
-    {
-        if (FPSControllerPrefab == null)
-        {
+    public void SetUpFPSController() {
+        if (FPSControllerPrefab == null) {
             Debug.LogError("FPS controller prefab is not set in Scene Manager.");
             return;
         }
         GameObject fpsObj = GameObject.Find(FPSControllerPrefab.name);
-        if (fpsObj == null)
-        {
+        if (fpsObj == null) {
             fpsObj = PrefabUtility.InstantiatePrefab(FPSControllerPrefab) as GameObject;
             fpsObj.name = FPSControllerPrefab.name;
-        }
-        else
-        {
+        } else {
             // re-attach to prefab
             GameObject prefabParent =
                 PrefabUtility.GetCorrespondingObjectFromSource(fpsObj) as GameObject;
-            if (prefabParent == null)
-            {
+            if (prefabParent == null) {
                 // if it's not attached to a prefab, delete and start over
                 Vector3 pos = fpsObj.transform.position;
                 GameObject.DestroyImmediate(fpsObj);
                 fpsObj = PrefabUtility.InstantiatePrefab(FPSControllerPrefab) as GameObject;
                 fpsObj.transform.position = pos;
-            }
-            else
-            {
+            } else {
                 PrefabUtility.RevertPrefabInstance(fpsObj, InteractionMode.AutomatedAction);
             }
         }
@@ -394,11 +348,9 @@ public void SetUpFPSController()
         //}
     }
 
-    void FindOrCreateParent(ref Transform parentTransform, string parentName)
-    {
+    void FindOrCreateParent(ref Transform parentTransform, string parentName) {
         GameObject parentGo = GameObject.Find(parentName);
-        if (parentGo == null)
-        {
+        if (parentGo == null) {
             parentGo = new GameObject(parentName);
         }
         // set to root just in case
@@ -409,20 +361,17 @@ void FindOrCreateParent(ref Transform parentTransform, string parentName)
 #endif
 }
 
-public enum SceneAnimationMode
-{
+public enum SceneAnimationMode {
     Instant,
     Smooth,
 }
 
-public enum ScenePhysicsMode
-{
+public enum ScenePhysicsMode {
     Static,
     Dynamic,
 }
 
-public enum SceneType
-{
+public enum SceneType {
     Kitchen,
     LivingRoom,
     Bathroom,
diff --git a/unity/Assets/Scripts/ScreenShotFromCamera.cs b/unity/Assets/Scripts/ScreenShotFromCamera.cs
index 81e9f0bbe5..99f009cf7f 100644
--- a/unity/Assets/Scripts/ScreenShotFromCamera.cs
+++ b/unity/Assets/Scripts/ScreenShotFromCamera.cs
@@ -1,15 +1,13 @@
 using System.Collections;
 using UnityEngine;
 
-public class ScreenShotFromCamera : MonoBehaviour
-{
+public class ScreenShotFromCamera : MonoBehaviour {
     public int resWidth = 3840;
     public int resHeight = 2160;
 
     private bool takeHiResShot = false;
 
-    public static string ScreenShotName(int width, int height)
-    {
+    public static string ScreenShotName(int width, int height) {
         return string.Format(
             "{0}/screenshots/screen_{1}x{2}_{3}.png",
             Application.dataPath,
@@ -19,16 +17,13 @@ public static string ScreenShotName(int width, int height)
         );
     }
 
-    public void TakeHiResShot()
-    {
+    public void TakeHiResShot() {
         takeHiResShot = true;
     }
 
-    void LateUpdate()
-    {
+    void LateUpdate() {
         takeHiResShot |= Input.GetKeyDown("k");
-        if (takeHiResShot)
-        {
+        if (takeHiResShot) {
             RenderTexture rt = new RenderTexture(resWidth, resHeight, 24);
             GetComponent<Camera>().targetTexture = rt;
             Texture2D screenShot = new Texture2D(resWidth, resHeight, TextureFormat.RGB24, false);
diff --git a/unity/Assets/Scripts/Screenshot360.cs b/unity/Assets/Scripts/Screenshot360.cs
index 5360116c55..8090785b7e 100644
--- a/unity/Assets/Scripts/Screenshot360.cs
+++ b/unity/Assets/Scripts/Screenshot360.cs
@@ -6,13 +6,11 @@
 using UnityEditor;
 #endif
 
-public class Screenshot360 : MonoBehaviour
-{
+public class Screenshot360 : MonoBehaviour {
 #if UNITY_EDITOR
     [MenuItem("GameObject/Take 360 Screenshot")]
 #endif
-    private static void Generate360Screenshot()
-    {
+    private static void Generate360Screenshot() {
         int imageWidth = 4096;
         bool saveAsJPEG = true;
         bool newFileName = false;
@@ -21,10 +19,8 @@ private static void Generate360Screenshot()
 
         byte[] bytes = I360Render.Capture(imageWidth, saveAsJPEG);
 
-        if (bytes != null)
-        {
-            while (!newFileName)
-            {
+        if (bytes != null) {
+            while (!newFileName) {
                 if (
                     File.Exists(
                         "Assets/360Photos/360Render_"
@@ -33,12 +29,9 @@ private static void Generate360Screenshot()
                             + currentCount
                             + (saveAsJPEG ? ".jpeg" : ".png")
                     )
-                )
-                {
+                ) {
                     currentCount++;
-                }
-                else
-                {
+                } else {
                     path = Path.Combine(
                         "Assets/360Photos",
                         "360Render_"
diff --git a/unity/Assets/Scripts/SerializeMesh.cs b/unity/Assets/Scripts/SerializeMesh.cs
index 6925bf7567..8f0e53c8ad 100644
--- a/unity/Assets/Scripts/SerializeMesh.cs
+++ b/unity/Assets/Scripts/SerializeMesh.cs
@@ -7,11 +7,9 @@
 using UnityEditor;
 #endif
 
-namespace Thor.Utils
-{
+namespace Thor.Utils {
     [System.Serializable]
-    public class SerializableMesh
-    {
+    public class SerializableMesh {
         // [SerializeField] public Vector2[] uv;
         // [SerializeField] public Vector3[] verticies;
         // [SerializeField] public Vector3[] normals;
@@ -26,8 +24,7 @@ public class SerializableMesh
 
     [ExecuteInEditMode]
     [RequireComponent(typeof(MeshFilter))]
-    public class SerializeMesh : MonoBehaviour
-    {
+    public class SerializeMesh : MonoBehaviour {
         // [HideInInspector] [SerializeField] Vector2[] uv;
         // [HideInInspector] [SerializeField] Vector3[] verticies;
         // [HideInInspector] [SerializeField] Vector3[] normals;
@@ -45,13 +42,11 @@ public class SerializeMesh : MonoBehaviour
 
         private static int materialCount = 0;
 
-        private static string getAssetRelativePath(string absPath)
-        {
+        private static string getAssetRelativePath(string absPath) {
             return string.Join("/", absPath.Split('/').SkipWhile(x => x != "Assets"));
         }
 
-        public static string MeshToObj(string name, Mesh mesh)
-        {
+        public static string MeshToObj(string name, Mesh mesh) {
             var objString = $"o {name}";
             var verts = string.Join(
                 "\n",
@@ -88,12 +83,10 @@ private static string SaveAsObj(
             string outPath,
             string prefix = "",
             bool overwite = true
-        )
-        {
+        ) {
             var obj = MeshToObj(assetId, mesh);
 
-            if (!Directory.Exists(outPath))
-            {
+            if (!Directory.Exists(outPath)) {
                 Directory.CreateDirectory(outPath);
             }
 
@@ -101,14 +94,11 @@ private static string SaveAsObj(
             var sep = prefix == "" ? "" : "_";
             var fileObj = $"{outPath}/{prefix}_{assetId}.obj";
 
-            if (!File.Exists(fileObj) || overwite)
-            {
+            if (!File.Exists(fileObj) || overwite) {
                 Debug.Log($"Writing obj to `{fileObj}`");
 
                 File.WriteAllText(fileObj, obj);
-            }
-            else
-            {
+            } else {
                 Debug.Log($"File `{fileObj}` exists, skipping");
             }
 
@@ -123,8 +113,7 @@ public static void SaveMeshesAsObjAndReplaceReferences(
             string collidersOutPath,
             bool overwrite = true,
             GameObject sourceGo = null
-        )
-        {
+        ) {
             var meshGo = go.transform.Find("mesh");
             var useOriginalAssetGeo = sourceGo != null;
 
@@ -134,8 +123,7 @@ public static void SaveMeshesAsObjAndReplaceReferences(
 
             var collidersSourceMeshes = colliders.Select(c => c.sharedMesh);
 
-            if (useOriginalAssetGeo)
-            {
+            if (useOriginalAssetGeo) {
                 mainMesh = sourceGo
                     .transform.Find("mesh")
                     .GetComponentInChildren<MeshFilter>()
@@ -164,8 +152,7 @@ public static void SaveMeshesAsObjAndReplaceReferences(
             AssetDatabase.Refresh();
 
             // is this necessary?
-            if (mainMesh.indexFormat == UnityEngine.Rendering.IndexFormat.UInt32)
-            {
+            if (mainMesh.indexFormat == UnityEngine.Rendering.IndexFormat.UInt32) {
                 var mi = AssetImporter.GetAtPath(getAssetRelativePath(objPath)) as ModelImporter;
                 mi.indexFormat = ModelImporterIndexFormat.UInt32;
             }
@@ -180,11 +167,9 @@ public static void SaveMeshesAsObjAndReplaceReferences(
                     (Mesh)AssetDatabase.LoadAssetAtPath(getAssetRelativePath(path), typeof(Mesh))
                 )
                 .ToArray();
-            for (var i = 0; i < colliders.Length; i++)
-            {
+            for (var i = 0; i < colliders.Length; i++) {
                 // is this necessary?
-                if (colliders[i].sharedMesh.indexFormat == UnityEngine.Rendering.IndexFormat.UInt32)
-                {
+                if (colliders[i].sharedMesh.indexFormat == UnityEngine.Rendering.IndexFormat.UInt32) {
                     var mi =
                         AssetImporter.GetAtPath(getAssetRelativePath(colliderObjPaths[i]))
                         as ModelImporter;
@@ -196,18 +181,15 @@ public static void SaveMeshesAsObjAndReplaceReferences(
             colliders = go
                 .transform.Find("TriggerColliders")
                 .GetComponentsInChildren<MeshCollider>();
-            for (var i = 0; i < colliders.Length; i++)
-            {
+            for (var i = 0; i < colliders.Length; i++) {
                 colliders[i].sharedMesh = collisionMeshes[i];
             }
         }
 #endif
 
-        void Awake()
-        {
+        void Awake() {
             Debug.Log("--- Awake called on object " + transform.parent.gameObject.name);
-            if (serialized)
-            {
+            if (serialized) {
                 GetComponent<MeshFilter>().sharedMesh = Rebuild();
             }
             // else {
@@ -215,18 +197,15 @@ void Awake()
             // }
         }
 
-        void Start()
-        {
-            if (serialized)
-            {
+        void Start() {
+            if (serialized) {
                 return;
             }
 
             Serialize();
         }
 
-        private SerializableMesh serializeMesh(Mesh mesh)
-        {
+        private SerializableMesh serializeMesh(Mesh mesh) {
             var outMesh = new SerializableMesh();
             outMesh.uv = mesh.uv;
             outMesh.verticies = mesh.vertices;
@@ -235,8 +214,7 @@ private SerializableMesh serializeMesh(Mesh mesh)
             return outMesh;
         }
 
-        private Mesh deSerializeMesh(SerializableMesh serializedMesh)
-        {
+        private Mesh deSerializeMesh(SerializableMesh serializedMesh) {
             Mesh mesh = new Mesh();
             mesh.vertices = serializedMesh.verticies;
             mesh.triangles = serializedMesh.triangles;
@@ -245,8 +223,7 @@ private Mesh deSerializeMesh(SerializableMesh serializedMesh)
             return mesh;
         }
 
-        public void Serialize()
-        {
+        public void Serialize() {
             Debug.Log("--- Serialize called  " + transform.parent.gameObject.name);
             var mesh = GetComponent<MeshFilter>().mesh;
 
@@ -265,8 +242,7 @@ public void Serialize()
             // }
 
             Debug.Log($"----- Serializing collider meshes {colliders.Length}");
-            for (var i = 0; i < colliders.Length; i++)
-            {
+            for (var i = 0; i < colliders.Length; i++) {
                 var collisionMesh = colliders[i].sharedMesh;
                 this.collisionMeshes[i] = this.serializeMesh(collisionMesh);
             }
@@ -296,8 +272,7 @@ public void Serialize()
             // }
         }
 
-        public Mesh Rebuild()
-        {
+        public Mesh Rebuild() {
             Mesh mesh = this.deSerializeMesh(model);
 
             // Mesh mesh = new Mesh();
@@ -315,8 +290,7 @@ public Mesh Rebuild()
                 .parent.Find("Colliders")
                 .GetComponentsInChildren<MeshCollider>();
 
-            for (var i = 0; i < colliders.Length; i++)
-            {
+            for (var i = 0; i < colliders.Length; i++) {
                 colliders[i].sharedMesh = deSerializeMesh(this.collisionMeshes[i]);
             }
 
@@ -324,8 +298,7 @@ public Mesh Rebuild()
                 .parent.Find("TriggerColliders")
                 .GetComponentsInChildren<MeshCollider>();
 
-            for (var i = 0; i < colliders.Length; i++)
-            {
+            for (var i = 0; i < colliders.Length; i++) {
                 colliders[i].sharedMesh = deSerializeMesh(this.collisionMeshes[i]);
             }
 
@@ -335,31 +308,24 @@ public Mesh Rebuild()
 
 #if UNITY_EDITOR
     [CustomEditor(typeof(SerializeMesh))]
-    class SerializeMeshEditor : Editor
-    {
+    class SerializeMeshEditor : Editor {
         SerializeMesh obj;
 
-        void OnSceneGUI()
-        {
+        void OnSceneGUI() {
             obj = (SerializeMesh)target;
         }
 
-        public override void OnInspectorGUI()
-        {
+        public override void OnInspectorGUI() {
             base.OnInspectorGUI();
 
-            if (GUILayout.Button("Rebuild"))
-            {
-                if (obj)
-                {
+            if (GUILayout.Button("Rebuild")) {
+                if (obj) {
                     obj.gameObject.GetComponent<MeshFilter>().mesh = obj.Rebuild();
                 }
             }
 
-            if (GUILayout.Button("Serialize"))
-            {
-                if (obj)
-                {
+            if (GUILayout.Button("Serialize")) {
+                if (obj) {
                     obj.Serialize();
                 }
             }
diff --git a/unity/Assets/Scripts/SimObj.cs b/unity/Assets/Scripts/SimObj.cs
index 99877e69f8..06b2440068 100644
--- a/unity/Assets/Scripts/SimObj.cs
+++ b/unity/Assets/Scripts/SimObj.cs
@@ -6,20 +6,16 @@
 
 [ExecuteInEditMode]
 [RequireComponent(typeof(Rigidbody))]
-public class SimObj : MonoBehaviour, SimpleSimObj
-{
-    public string ObjectID
-    {
+public class SimObj : MonoBehaviour, SimpleSimObj {
+    public string ObjectID {
         get { return objectID; }
-        set
-        {
+        set {
             // TODO add an ID lock
             objectID = value;
         }
     }
 
-    public bool IsVisible
-    {
+    public bool IsVisible {
         get { return isVisible; }
         set { isVisible = value; }
     }
@@ -76,54 +72,42 @@ public bool IsVisible
 
     // stores the location of the simObj on startup
 
-    public SimObjType ObjType
-    {
+    public SimObjType ObjType {
         get { return Type; }
     }
 
-    public List<string> ReceptacleObjectIds
-    {
-        get
-        {
+    public List<string> ReceptacleObjectIds {
+        get {
             List<string> objectIds = new List<string>();
-            foreach (SimObj o in SimUtil.GetItemsFromReceptacle(this.Receptacle))
-            {
+            foreach (SimObj o in SimUtil.GetItemsFromReceptacle(this.Receptacle)) {
                 objectIds.Add(o.objectID);
             }
             return objectIds;
         }
     }
 
-    public Transform StartupTransform
-    {
+    public Transform StartupTransform {
         get { return startupTransform; }
     }
 
-    public Animator Animator
-    {
+    public Animator Animator {
         get { return animator; }
     }
-    public Receptacle Receptacle
-    {
+    public Receptacle Receptacle {
         get { return receptacle; }
     }
-    public Rearrangeable Rearrangeable
-    {
+    public Rearrangeable Rearrangeable {
         get { return rearrangeable; }
     }
-    public bool IsReceptacle
-    {
+    public bool IsReceptacle {
         get { return receptacle != null; }
     }
-    public bool IsAnimated
-    {
+    public bool IsAnimated {
         get { return animator != null; }
     }
-    public bool IsAnimating
-    {
+    public bool IsAnimating {
         get { return isAnimating; }
-        set
-        {
+        set {
 #if UNITY_EDITOR
             UnityEditor.EditorUtility.SetDirty(this);
 #endif
@@ -131,73 +115,54 @@ public bool IsAnimating
         }
     }
 
-    private bool updateAnimState(Animator anim, int value)
-    {
+    private bool updateAnimState(Animator anim, int value) {
         AnimatorControllerParameter param = anim.parameters[0];
 
-        if (anim.GetInteger(param.name) == value)
-        {
+        if (anim.GetInteger(param.name) == value) {
             return false;
-        }
-        else
-        {
+        } else {
             anim.SetInteger(param.name, value);
             return true;
         }
     }
 
-    private bool updateAnimState(Animator anim, bool value)
-    {
+    private bool updateAnimState(Animator anim, bool value) {
         AnimatorControllerParameter param = anim.parameters[0];
 
-        if (anim.GetBool(param.name) == value)
-        {
+        if (anim.GetBool(param.name) == value) {
             return false;
-        }
-        else
-        {
+        } else {
             anim.SetBool(param.name, value);
             return true;
         }
     }
 
-    public bool Open()
-    {
+    public bool Open() {
         bool res = false;
-        if (OPEN_CLOSE_STATES.ContainsKey(this.Type))
-        {
+        if (OPEN_CLOSE_STATES.ContainsKey(this.Type)) {
             res = updateAnimState(this.Animator, OPEN_CLOSE_STATES[this.Type]["open"]);
-        }
-        else if (this.IsAnimated)
-        {
+        } else if (this.IsAnimated) {
             res = updateAnimState(this.Animator, true);
         }
 
         return res;
     }
 
-    public bool Close()
-    {
+    public bool Close() {
         bool res = false;
-        if (OPEN_CLOSE_STATES.ContainsKey(this.Type))
-        {
+        if (OPEN_CLOSE_STATES.ContainsKey(this.Type)) {
             res = updateAnimState(this.Animator, OPEN_CLOSE_STATES[this.Type]["close"]);
-        }
-        else if (this.IsAnimated)
-        {
+        } else if (this.IsAnimated) {
             res = updateAnimState(this.Animator, false);
         }
 
         return res;
     }
 
-    public bool VisibleToRaycasts
-    {
+    public bool VisibleToRaycasts {
         get { return visibleToRaycasts; }
-        set
-        {
-            if (colliders == null)
-            {
+        set {
+            if (colliders == null) {
 #if UNITY_EDITOR
                 Debug.LogWarning(
                     "Warning: Tried to set colliders enabled before item was initialized in " + name
@@ -207,14 +172,12 @@ public bool VisibleToRaycasts
                 return;
             }
 
-            if (visibleToRaycasts != value)
-            {
+            if (visibleToRaycasts != value) {
                 visibleToRaycasts = value;
                 gameObject.layer = (
                     visibleToRaycasts ? SimUtil.RaycastVisibleLayer : SimUtil.RaycastHiddenLayer
                 );
-                for (int i = 0; i < colliders.Length; i++)
-                {
+                for (int i = 0; i < colliders.Length; i++) {
                     colliders[i].gameObject.layer = (
                         visibleToRaycasts ? SimUtil.RaycastVisibleLayer : SimUtil.RaycastHiddenLayer
                     );
@@ -222,23 +185,19 @@ public bool VisibleToRaycasts
             }
         }
     }
-    public Vector3 CenterPoint
-    {
+    public Vector3 CenterPoint {
         get { return centerPoint; }
     }
 
-    public Vector3 TopPoint
-    {
+    public Vector3 TopPoint {
         get { return topPoint; }
     }
 
-    public Vector3 BottomPoint
-    {
+    public Vector3 BottomPoint {
         get { return bottomPoint; }
     }
 
-    public Bounds Bounds
-    {
+    public Bounds Bounds {
         get { return bounds; }
     }
 
@@ -246,8 +205,7 @@ public Bounds Bounds
 
 #if UNITY_EDITOR
     // used for debugging object visibility
-    public string Error
-    {
+    public string Error {
         get { return error; }
     }
     string error = string.Empty;
@@ -270,60 +228,47 @@ public string Error
     private Bounds bounds;
 
     // this guy right here caused the giant groceries... should only be an issue with pivots
-    public void ResetScale()
-    {
+    public void ResetScale() {
         Transform tempParent = transform.parent;
         transform.parent = null;
         transform.localScale = startupScale;
         transform.parent = tempParent;
     }
 
-    public bool IsPickupable
-    {
-        get
-        {
+    public bool IsPickupable {
+        get {
             return !this.IsOpenable
                 && !this.IsReceptacle
                 && !(Array.IndexOf(ImmobileTypes, this.Type) >= 0);
         }
     }
 
-    public bool IsOpen
-    {
-        get
-        {
+    public bool IsOpen {
+        get {
             Animator anim = this.Animator;
             AnimatorControllerParameter param = anim.parameters[0];
-            if (OPEN_CLOSE_STATES.ContainsKey(this.Type))
-            {
+            if (OPEN_CLOSE_STATES.ContainsKey(this.Type)) {
                 return anim.GetInteger(param.name) == OPEN_CLOSE_STATES[this.Type]["open"];
-            }
-            else
-            {
+            } else {
                 return anim.GetBool(param.name);
             }
         }
     }
 
-    public bool IsOpenable
-    {
+    public bool IsOpenable {
         get { return Array.IndexOf(OpenableTypes, this.Type) >= 0 && this.IsAnimated; }
     }
 
-    public void RecalculatePoints()
-    {
+    public void RecalculatePoints() {
         // get first renderer in object, use that object's bounds to get center point
         Renderer r = null;
-        if (!IsReceptacle)
-        {
+        if (!IsReceptacle) {
             r = gameObject.GetComponentInChildren<MeshRenderer>();
         }
 
-        if (r != null)
-        {
+        if (r != null) {
             centerPoint = r.bounds.center;
-            if (UseWidthSearch)
-            {
+            if (UseWidthSearch) {
                 topPoint =
                     centerPoint
                     + (Vector3.left * r.bounds.extents.x)
@@ -332,32 +277,23 @@ public void RecalculatePoints()
                     centerPoint
                     + (Vector3.right * r.bounds.extents.x)
                     + (Vector3.back * r.bounds.extents.z);
-            }
-            else
-            {
+            } else {
                 topPoint = centerPoint + (Vector3.up * r.bounds.extents.y);
                 bottomPoint = centerPoint + (Vector3.down * r.bounds.extents.y);
             }
             bounds = r.bounds;
-        }
-        else
-        {
+        } else {
             // get the first collider
             Collider c = null;
-            if (IsReceptacle)
-            {
+            if (IsReceptacle) {
                 c = receptacle.VisibilityCollider;
-            }
-            else
-            {
+            } else {
                 c = gameObject.GetComponentInChildren<Collider>();
             }
 
-            if (c != null)
-            {
+            if (c != null) {
                 centerPoint = c.bounds.center;
-                if (UseWidthSearch)
-                {
+                if (UseWidthSearch) {
                     topPoint =
                         centerPoint
                         + (Vector3.left * c.bounds.extents.x)
@@ -366,37 +302,29 @@ public void RecalculatePoints()
                         centerPoint
                         + (Vector3.right * c.bounds.extents.x)
                         + (Vector3.back * c.bounds.extents.z);
-                }
-                else
-                {
+                } else {
                     topPoint = centerPoint + (Vector3.up * c.bounds.extents.y);
                     bottomPoint = centerPoint + (Vector3.down * c.bounds.extents.y);
                 }
                 bounds = c.bounds;
-            }
-            else
-            {
+            } else {
                 Debug.Log("Couldn't calculate center point in " + gameObject.name);
             }
         }
     }
 
-    void OnCollisionEnter(Collision col)
-    {
+    void OnCollisionEnter(Collision col) {
         this.hasCollision = true;
     }
 
     // we do this to handle the case when an object is moved into by navigation into an object; since we reset the hasCollision flag to false prior
     // to the moveHand we check if we are leaving a collider and consider that to be a collision as well
-    void OnCollisionExit(Collision col)
-    {
+    void OnCollisionExit(Collision col) {
         this.hasCollision = true;
     }
 
-    protected virtual void OnEnable()
-    {
-        if (SceneManager.Current == null)
-        {
+    protected virtual void OnEnable() {
+        if (SceneManager.Current == null) {
             return;
         }
 
@@ -416,8 +344,7 @@ protected virtual void OnEnable()
         colliders = gameObject.GetComponentsInChildren<Collider>();
 
         // if the manip type isn't inventory, use the presence of the rearrangeable component to determine type
-        switch (Manipulation)
-        {
+        switch (Manipulation) {
             case SimObjManipType.Inventory:
                 break;
 
@@ -429,35 +356,28 @@ protected virtual void OnEnable()
         }
 
 #if UNITY_EDITOR
-        if (Type == SimObjType.Undefined)
-        {
+        if (Type == SimObjType.Undefined) {
             // check our prefab just in case the enum has gotten disconnected
             GameObject prefabParent =
                 UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(gameObject)
                 as GameObject;
-            if (prefabParent != null)
-            {
+            if (prefabParent != null) {
                 SimObj ps = prefabParent.GetComponent<SimObj>();
-                if (ps != null)
-                {
+                if (ps != null) {
                     Type = ps.Type;
                 }
             }
         }
 
-        if (!Application.isPlaying)
-        {
-            foreach (Collider c in colliders)
-            {
+        if (!Application.isPlaying) {
+            foreach (Collider c in colliders) {
                 c.gameObject.layer = SimUtil.RaycastVisibleLayer;
             }
 
             // if we're type static, set our renderers to static so navmeshes generate correctly
             MeshRenderer[] renderers = gameObject.GetComponentsInChildren<MeshRenderer>();
-            foreach (MeshRenderer mr in renderers)
-            {
-                switch (Manipulation)
-                {
+            foreach (MeshRenderer mr in renderers) {
+                switch (Manipulation) {
                     case SimObjManipType.Static:
                         mr.gameObject.isStatic = true;
                         UnityEditor.GameObjectUtility.SetNavMeshArea(
@@ -498,15 +418,12 @@ protected virtual void OnEnable()
 #endif
 
         Rigidbody rb = GetComponent<Rigidbody>();
-        if (rb == null)
-        {
+        if (rb == null) {
             rb = gameObject.AddComponent<Rigidbody>();
         }
 
-        if (SceneManager.Current.LocalPhysicsMode == ScenePhysicsMode.Dynamic)
-        {
-            switch (Manipulation)
-            {
+        if (SceneManager.Current.LocalPhysicsMode == ScenePhysicsMode.Dynamic) {
+            switch (Manipulation) {
                 case SimObjManipType.Static:
                 case SimObjManipType.StaticNoPlacement:
                     rb.isKinematic = true;
@@ -516,20 +433,15 @@ protected virtual void OnEnable()
                     rb.isKinematic = false;
                     break;
             }
-        }
-        else
-        {
+        } else {
             rb.isKinematic = true;
         }
 
         RecalculatePoints();
 
-        if (Application.isPlaying)
-        {
-            if (startupTransform == null)
-            {
-                switch (Manipulation)
-                {
+        if (Application.isPlaying) {
+            if (startupTransform == null) {
+                switch (Manipulation) {
                     case SimObjManipType.Inventory:
                         // if we can enter inventory
                         // create a transform that stores our startup position
@@ -557,79 +469,62 @@ protected virtual void OnEnable()
     }
 
 #if UNITY_EDITOR
-    public void RefreshColliders()
-    {
+    public void RefreshColliders() {
         colliders = gameObject.GetComponentsInChildren<Collider>();
     }
 
-    void CheckForErrors()
-    {
+    void CheckForErrors() {
         error = string.Empty;
         colliders = gameObject.GetComponentsInChildren<Collider>();
         // make sure all raycast targets are tagged correctly
-        if (colliders.Length == 0)
-        {
+        if (colliders.Length == 0) {
             error = "No colliders attached!";
             return;
         }
 
-        if (!gameObject.CompareTag(SimUtil.ReceptacleTag))
-        {
+        if (!gameObject.CompareTag(SimUtil.ReceptacleTag)) {
             gameObject.tag = SimUtil.SimObjTag;
         }
 
-        foreach (Collider c in colliders)
-        {
+        foreach (Collider c in colliders) {
             // don't re-tag something that's tagged as a receptacle
-            if (!c.CompareTag(SimUtil.ReceptacleTag))
-            {
+            if (!c.CompareTag(SimUtil.ReceptacleTag)) {
                 c.gameObject.tag = SimUtil.SimObjTag;
             }
         }
 
-        if (Type == SimObjType.Undefined)
-        {
+        if (Type == SimObjType.Undefined) {
             error = "Type is undefined!";
             return;
         }
 
-        if (UseCustomBounds && BoundsTransform == null)
-        {
+        if (UseCustomBounds && BoundsTransform == null) {
             error = "Using custom bounds but no BoundsTransform supplied!";
         }
     }
 
-    void Update()
-    {
+    void Update() {
         // TEMPORARY - we'll move this into receptacl
-        if (transform.position != lastPosition)
-        {
+        if (transform.position != lastPosition) {
             lastPosition = transform.position;
             RecalculatePoints();
         }
     }
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.white;
 
-        if (!SimUtil.ShowObjectVisibility)
-        {
+        if (!SimUtil.ShowObjectVisibility) {
             VisibleNow = false;
         }
 
-        if (!string.IsNullOrEmpty(error))
-        {
+        if (!string.IsNullOrEmpty(error)) {
             Gizmos.color = Color.Lerp(Color.red, Color.clear, 0.5f);
             Gizmos.DrawSphere(transform.position, 0.25f);
             CheckForErrors();
-        }
-        else
-        {
-            if (UseCustomBounds && SimUtil.ShowCustomBounds)
-            {
-                if (BoundsTransform != null)
-                {
+        } else {
+            if (UseCustomBounds && SimUtil.ShowCustomBounds) {
+                if (BoundsTransform != null) {
                     // draw aligned bounding box
                     Gizmos.matrix = transform.localToWorldMatrix;
                     Gizmos.color = VisibleNow ? Color.yellow : Color.cyan;
@@ -645,8 +540,7 @@ void OnDrawGizmos()
                 }
             }
 
-            if (UnityEditor.Selection.activeGameObject == gameObject)
-            {
+            if (UnityEditor.Selection.activeGameObject == gameObject) {
                 Gizmos.color = Color.white;
                 Gizmos.DrawWireSphere(CenterPoint, 0.02f);
                 Gizmos.color = Color.Lerp(Color.cyan, Color.clear, 0.5f);
@@ -654,12 +548,10 @@ void OnDrawGizmos()
                 Gizmos.DrawWireSphere(BottomPoint, 0.02f);
             }
 
-            if (VisibleNow)
-            {
+            if (VisibleNow) {
                 // draw an outline around our biggest renderer
                 MeshFilter mf = gameObject.GetComponentInChildren<MeshFilter>(false);
-                if (mf != null)
-                {
+                if (mf != null) {
                     Gizmos.color = Color.yellow;
                     Gizmos.DrawWireMesh(
                         mf.sharedMesh,
@@ -668,12 +560,9 @@ void OnDrawGizmos()
                         mf.transform.rotation,
                         mf.transform.lossyScale
                     );
-                }
-                else
-                {
+                } else {
                     // probably a visibility collider only sim obj
-                    if (IsReceptacle)
-                    {
+                    if (IsReceptacle) {
                         Gizmos.color = Color.yellow;
                         // Gizmos.matrix = receptacle.VisibilityCollider.transform.worldToLocalMatrix;
                         Gizmos.DrawSphere(centerPoint, 0.25f);
@@ -686,8 +575,7 @@ void OnDrawGizmos()
 #endif
 }
 
-public interface SimpleSimObj
-{
+public interface SimpleSimObj {
     SimObjType ObjType { get; }
     string ObjectID { get; set; }
     List<string> ReceptacleObjectIds { get; }
diff --git a/unity/Assets/Scripts/SimObjPhysics.cs b/unity/Assets/Scripts/SimObjPhysics.cs
index 136e699e1a..9a5eacc116 100644
--- a/unity/Assets/Scripts/SimObjPhysics.cs
+++ b/unity/Assets/Scripts/SimObjPhysics.cs
@@ -10,8 +10,7 @@
 using UnityEditor.SceneManagement;
 #endif
 
-public class SimObjPhysics : MonoBehaviour, SimpleSimObj
-{
+public class SimObjPhysics : MonoBehaviour, SimpleSimObj {
     [Header("Unique String ID of this Object In Scene")]
     [SerializeField]
     public string objectID = string.Empty;
@@ -126,36 +125,30 @@ public class SimObjPhysics : MonoBehaviour, SimpleSimObj
 
     private bool forceCreateObjectOrientedBoundingBox = false;
 
-    private bool shouldCreateObjectOrientedBoundingBox
-    {
-        get
-        {
+    private bool shouldCreateObjectOrientedBoundingBox {
+        get {
             return this.forceCreateObjectOrientedBoundingBox
                 || this.IsPickupable
                 || this.IsMoveable;
         }
     }
 
-    public GameObject GetSceneManager()
-    {
+    public GameObject GetSceneManager() {
         return sceneManager.gameObject;
     }
 
-    public float GetTimerResetValue()
-    {
+    public float GetTimerResetValue() {
         return TimerResetValue;
     }
 
-    public void SetHowManySecondsUntilRoomTemp(float f)
-    {
+    public void SetHowManySecondsUntilRoomTemp(float f) {
         TimerResetValue = f;
         HowManySecondsUntilRoomTemp = f;
     }
 
     private bool StartRoomTempTimer = false;
 
-    public void SetStartRoomTempTimer(bool b)
-    {
+    public void SetStartRoomTempTimer(bool b) {
         StartRoomTempTimer = b;
     }
 
@@ -168,37 +161,31 @@ public void SetStartRoomTempTimer(bool b)
     public List<GameObject> CurrentlyContains;
 #endif
 
-    public class PhysicsMaterialValues
-    {
+    public class PhysicsMaterialValues {
         public float DynamicFriction;
         public float StaticFriction;
         public float Bounciness;
 
-        public PhysicsMaterialValues(float dFriction, float sFriction, float b)
-        {
+        public PhysicsMaterialValues(float dFriction, float sFriction, float b) {
             DynamicFriction = dFriction;
             StaticFriction = sFriction;
             Bounciness = b;
         }
     }
 
-    public void AddToContainedObjectReferences(SimObjPhysics t)
-    {
+    public void AddToContainedObjectReferences(SimObjPhysics t) {
         ContainedObjectReferences.Add(t);
     }
 
-    public void RemoveFromContainedObjectReferences(SimObjPhysics t)
-    {
+    public void RemoveFromContainedObjectReferences(SimObjPhysics t) {
         ContainedObjectReferences.Remove(t);
     }
 
     public void syncBoundingBoxes(
         bool forceCacheReset = false,
         bool forceCreateObjectOrientedBoundingBox = false
-    )
-    {
-        if (forceCreateObjectOrientedBoundingBox)
-        {
+    ) {
+        if (forceCreateObjectOrientedBoundingBox) {
             bool shouldCreateBefore = this.shouldCreateObjectOrientedBoundingBox;
             this.forceCreateObjectOrientedBoundingBox = forceCreateObjectOrientedBoundingBox;
 
@@ -226,8 +213,7 @@ public void syncBoundingBoxes(
             && (!this.IsBreakable || this.IsBroken == this.boundingBoxCacheKey.IsBroken)
             && Quaternion.Angle(rotation, this.boundingBoxCacheKey.rotation) < 0.0001f
             && Vector3.Distance(position, this.boundingBoxCacheKey.position) < 0.0001f
-        )
-        {
+        ) {
             return;
         }
         this.cachedAxisAlignedBoundingBox = this.axisAlignedBoundingBox();
@@ -235,31 +221,25 @@ public void syncBoundingBoxes(
         this.boundingBoxCacheKey = new BoundingBoxCacheKey();
         this.boundingBoxCacheKey.position = position;
         this.boundingBoxCacheKey.rotation = rotation;
-        if (this.IsOpenable)
-        {
+        if (this.IsOpenable) {
             this.boundingBoxCacheKey.IsOpen = this.IsOpen;
             this.boundingBoxCacheKey.openness = this.openness;
         }
-        if (this.IsBreakable)
-        {
+        if (this.IsBreakable) {
             this.boundingBoxCacheKey.IsBroken = this.IsBroken;
         }
-        if (this.IsSliced)
-        {
+        if (this.IsSliced) {
             this.boundingBoxCacheKey.IsSliced = this.IsSliced;
         }
     }
 
-    private AxisAlignedBoundingBox axisAlignedBoundingBox()
-    {
+    private AxisAlignedBoundingBox axisAlignedBoundingBox() {
         AxisAlignedBoundingBox b = new AxisAlignedBoundingBox();
 
         // unparent child simobjects during bounding box generation
         List<Transform> childSimObjects = new List<Transform>();
-        foreach (SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>())
-        {
-            if (simObject != this)
-            {
+        foreach (SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>()) {
+            if (simObject != this) {
                 childSimObjects.Add(simObject.transform);
 
                 // TODO: fix, This line makes accessing the axisAligned bounding box of some composed object during edior fail
@@ -280,11 +260,9 @@ private AxisAlignedBoundingBox axisAlignedBoundingBox()
         Collider[] cols = this.GetComponentsInChildren<Collider>();
 
         // 0 colliders mean the object is despawned, so this will cause objects broken into pieces to not generate an axis aligned box
-        if (cols.Length == 0)
-        {
+        if (cols.Length == 0) {
             SimObjPhysics sopc = this.GetComponent<SimObjPhysics>();
-            if (sopc.IsBroken || sopc.IsSliced)
-            {
+            if (sopc.IsBroken || sopc.IsSliced) {
 #if UNITY_EDITOR
                 Debug.Log(
                     "Object is broken or sliced in pieces, no AxisAligned box generated: "
@@ -292,9 +270,7 @@ private AxisAlignedBoundingBox axisAlignedBoundingBox()
                 );
 #endif
                 return b;
-            }
-            else
-            {
+            } else {
 #if UNITY_EDITOR
                 Debug.Log("Something went wrong, no Colliders were found on" + this.name);
 #endif
@@ -303,21 +279,17 @@ private AxisAlignedBoundingBox axisAlignedBoundingBox()
         }
 
         Bounds bounding = UtilityFunctions.CreateEmptyBounds();
-        foreach (Collider c in cols)
-        {
-            if (c.enabled && !c.isTrigger)
-            {
+        foreach (Collider c in cols) {
+            if (c.enabled && !c.isTrigger) {
                 bounding.Encapsulate(c.bounds);
             }
         }
-        foreach (Transform visPoint in this.VisibilityPoints)
-        {
+        foreach (Transform visPoint in this.VisibilityPoints) {
             bounding.Encapsulate(visPoint.position);
         }
 
         // reparent child simobjects
-        foreach (Transform childSimObject in childSimObjects)
-        {
+        foreach (Transform childSimObject in childSimObjects) {
             childSimObject.SetParent(this.transform);
         }
 
@@ -338,12 +310,9 @@ private AxisAlignedBoundingBox axisAlignedBoundingBox()
             bounding.center.z + bounding.size.z / 2f,
             bounding.center.z - bounding.size.z / 2f
         };
-        foreach (float x in xs)
-        {
-            foreach (float y in ys)
-            {
-                foreach (float z in zs)
-                {
+        foreach (float x in xs) {
+            foreach (float y in ys) {
+                foreach (float z in zs) {
                     cornerPoints.Add(new float[] { x, y, z });
                 }
             }
@@ -356,24 +325,18 @@ private AxisAlignedBoundingBox axisAlignedBoundingBox()
         return b;
     }
 
-    private ObjectOrientedBoundingBox objectOrientedBoundingBox()
-    {
-        if (this.shouldCreateObjectOrientedBoundingBox)
-        {
+    private ObjectOrientedBoundingBox objectOrientedBoundingBox() {
+        if (this.shouldCreateObjectOrientedBoundingBox) {
             ObjectOrientedBoundingBox b = new ObjectOrientedBoundingBox();
 
             bool shouldSetupBBox = false;
-            try
-            {
+            try {
                 shouldSetupBBox = this.BoundingBox == null;
-            }
-            catch (UnassignedReferenceException e)
-            {
+            } catch (UnassignedReferenceException e) {
                 shouldSetupBBox = true;
             }
 
-            if (shouldSetupBBox)
-            {
+            if (shouldSetupBBox) {
                 GameObject bb = new GameObject("BoundingBox");
                 bb.transform.position = gameObject.transform.position;
                 bb.transform.SetParent(gameObject.transform);
@@ -389,10 +352,8 @@ private ObjectOrientedBoundingBox objectOrientedBoundingBox()
             List<Transform> childSimObjects = new List<Transform>();
             foreach (
                 SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>()
-            )
-            {
-                if (simObject != this)
-                {
+            ) {
+                if (simObject != this) {
                     childSimObjects.Add(simObject.transform);
                     simObject.transform.parent = null;
                 }
@@ -406,10 +367,8 @@ SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>
             // Get all colliders on the sop, excluding colliders if they are not enabled
             List<(Collider, LayerMask)> cols = new List<(Collider, LayerMask)>();
             var nonInteractiveLayer = LayerMask.NameToLayer("NonInteractive");
-            foreach (Collider c in clone.transform.GetComponentsInChildren<Collider>())
-            {
-                if (c.enabled)
-                {
+            foreach (Collider c in clone.transform.GetComponentsInChildren<Collider>()) {
+                if (c.enabled) {
                     // save the state of all the layers prior to modifying
                     cols.Add((c, c.transform.gameObject.layer));
 
@@ -422,17 +381,14 @@ SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>
             Bounds newBB = UtilityFunctions.CreateEmptyBounds();
 
             // Encapsulate all active colliders in SimObject's array
-            foreach ((Collider, LayerMask) colAndLayerMask in cols)
-            {
+            foreach ((Collider, LayerMask) colAndLayerMask in cols) {
                 Collider c = colAndLayerMask.Item1;
-                if (!c.isTrigger && c.gameObject != clone.GetComponent<SimObjPhysics>().BoundingBox)
-                {
+                if (!c.isTrigger && c.gameObject != clone.GetComponent<SimObjPhysics>().BoundingBox) {
                     newBB.Encapsulate(c.bounds);
                 }
             }
             // Encapsulate all visilibity points of the SimObject array
-            foreach (Transform visPoint in clone.GetComponent<SimObjPhysics>().VisibilityPoints)
-            {
+            foreach (Transform visPoint in clone.GetComponent<SimObjPhysics>().VisibilityPoints) {
                 newBB.Encapsulate(visPoint.position);
             }
 
@@ -443,14 +399,12 @@ SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>
             this.BoundingBox.GetComponent<BoxCollider>().size = newBB.extents * 2.0f;
 
             // Re-enable colliders, moving them back to their original layer
-            foreach ((Collider, LayerMask) colAndLayerMask in cols)
-            {
+            foreach ((Collider, LayerMask) colAndLayerMask in cols) {
                 colAndLayerMask.Item1.transform.gameObject.layer = colAndLayerMask.Item2;
             }
 
             // reparent child simobjects
-            foreach (Transform childSimObject in childSimObjects)
-            {
+            foreach (Transform childSimObject in childSimObjects) {
                 childSimObject.SetParent(this.transform);
             }
 
@@ -500,8 +454,7 @@ SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>
             );
 
             List<float[]> cornerPoints = new List<float[]>();
-            foreach (Vector3 p in points)
-            {
+            foreach (Vector3 p in points) {
                 cornerPoints.Add(new float[] { p.x, p.y, p.z });
             }
 
@@ -513,28 +466,22 @@ SimObjPhysics simObject in this.transform.GetComponentsInChildren<SimObjPhysics>
         return null;
     }
 
-    public void DropContainedObjectsStationary()
-    {
+    public void DropContainedObjectsStationary() {
         this.DropContainedObjects(reparentContainedObjects: false, forceKinematic: true);
     }
 
-    public void DropContainedObjects(bool reparentContainedObjects, bool forceKinematic)
-    {
-        if (this.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-        {
+    public void DropContainedObjects(bool reparentContainedObjects, bool forceKinematic) {
+        if (this.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
             GameObject topObject = null;
 
-            foreach (SimObjPhysics sop in this.ContainedObjectReferences)
-            {
+            foreach (SimObjPhysics sop in this.ContainedObjectReferences) {
                 // for every object that is contained by this object turn off
                 // the colliders, leaving Trigger Colliders active (this is important to maintain visibility!)
                 sop.transform.Find("Colliders").gameObject.SetActive(true);
                 sop.isInAgentHand = false; // Agent hand flag
 
-                if (reparentContainedObjects)
-                {
-                    if (topObject == null)
-                    {
+                if (reparentContainedObjects) {
+                    if (topObject == null) {
                         topObject = GameObject.Find("Objects");
                     }
                     sop.transform.SetParent(topObject.transform);
@@ -542,8 +489,7 @@ public void DropContainedObjects(bool reparentContainedObjects, bool forceKinema
 
                 Rigidbody rb = sop.GetComponent<Rigidbody>();
                 rb.isKinematic = forceKinematic;
-                if (!forceKinematic)
-                {
+                if (!forceKinematic) {
                     rb.useGravity = true;
                     rb.constraints = RigidbodyConstraints.None;
                     rb.collisionDetectionMode = CollisionDetectionMode.ContinuousSpeculative;
@@ -553,212 +499,159 @@ public void DropContainedObjects(bool reparentContainedObjects, bool forceKinema
         }
     }
 
-    public AxisAlignedBoundingBox AxisAlignedBoundingBox
-    {
-        get
-        {
+    public AxisAlignedBoundingBox AxisAlignedBoundingBox {
+        get {
             this.syncBoundingBoxes();
             return this.cachedAxisAlignedBoundingBox;
         }
     }
 
-    public ObjectOrientedBoundingBox ObjectOrientedBoundingBox
-    {
-        get
-        {
+    public ObjectOrientedBoundingBox ObjectOrientedBoundingBox {
+        get {
             this.syncBoundingBoxes();
             return this.cachedObjectOrientedBoundingBox;
         }
     }
 
-    public void ClearContainedObjectReferences()
-    {
+    public void ClearContainedObjectReferences() {
         ContainedObjectReferences.Clear();
     }
 
-    public string ObjectID
-    {
+    public string ObjectID {
         get { return objectID; }
         set { objectID = value; }
     }
 
-    public SimObjType ObjType
-    {
+    public SimObjType ObjType {
         get { return Type; }
         set { Type = value; }
     }
 
-    public int ReceptacleCount
-    {
+    public int ReceptacleCount {
         get { return 0; }
     }
 
-    public List<string> ReceptacleObjectIds
-    {
+    public List<string> ReceptacleObjectIds {
         get { return this.GetAllSimObjectsInReceptacleTriggersByObjectID(); }
     }
 
     // get all objects contained by this receptacle object as a list of SimObjPhysics
-    public List<SimObjPhysics> SimObjectsContainedByReceptacle
-    {
+    public List<SimObjPhysics> SimObjectsContainedByReceptacle {
         get { return this.GetAllSimObjectsInReceptacleTriggers(); }
     }
 
     // return mass of object
-    public float Mass
-    {
-        get
-        {
+    public float Mass {
+        get {
             var rb = this.GetComponent<Rigidbody>();
             return rb != null ? rb.mass : 0.0f;
         }
     }
 
     // if this pickupable object is being held by the agent right
-    public bool isPickedUp
-    {
+    public bool isPickedUp {
         get { return this.isInAgentHand; }
     }
 
     // note some objects are not toggleable, but can still return the IsToggled meta value (ex: stove burners)
     // stove burners are not toggleable directly, a stove knob controls them.
-    private bool isToggleable
-    {
-        get
-        {
-            if (this.GetComponent<CanToggleOnOff>())
-            {
+    private bool isToggleable {
+        get {
+            if (this.GetComponent<CanToggleOnOff>()) {
                 // if this object is self controlled, it is toggleable
-                if (this.GetComponent<CanToggleOnOff>().ReturnSelfControlled())
-                {
+                if (this.GetComponent<CanToggleOnOff>().ReturnSelfControlled()) {
                     return true;
                 }
                 // if it is not self controlled (meaning controlled by another sim object) return not toggleable
                 // although if this object is not toggleable, it may still return isToggled as a state (see IsToggled below)
-                else
-                {
+                else {
                     return false;
                 }
-            }
-            else
-            {
+            } else {
                 return false;
             }
             // return this.GetComponent<CanToggleOnOff>();
         }
     }
 
-    public bool IsToggled
-    {
-        get
-        {
+    public bool IsToggled {
+        get {
             // note: this can return "toggled on or off" info about objects that are controlled by other sim objects
             // for example, a stove burner will return if it is on/off even though the burner itself cannot be interacted with
             // to toggle the on/off state. Stove burners and objects like it can only have their state toggled by a sim object
             // that controls it (in this case stove knob -controls-> stove burner)
             CanToggleOnOff ctoo = this.GetComponent<CanToggleOnOff>();
 
-            if (ctoo != null)
-            {
+            if (ctoo != null) {
                 return ctoo.isOn;
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
-    public float openness
-    {
+    public float openness {
         get { return this.GetComponent<CanOpen_Object>().currentOpenness; }
     }
 
-    public bool IsOpen
-    {
-        get
-        {
+    public bool IsOpen {
+        get {
             CanOpen_Object coo = this.GetComponent<CanOpen_Object>();
 
-            if (coo != null)
-            {
+            if (coo != null) {
                 return coo.isOpen;
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
-    public bool IsBroken
-    {
-        get
-        {
+    public bool IsBroken {
+        get {
             Break b = this.GetComponentInChildren<Break>();
-            if (b != null)
-            {
+            if (b != null) {
                 return b.isBroken();
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
-    public bool IsFilled
-    {
-        get
-        {
+    public bool IsFilled {
+        get {
             Fill f = this.GetComponent<Fill>();
-            if (f != null)
-            {
+            if (f != null) {
                 return f.IsFilled();
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
-    public string FillLiquid
-    {
-        get
-        {
+    public string FillLiquid {
+        get {
             Fill f = this.GetComponent<Fill>();
             return f == null ? null : f.FilledLiquid();
         }
     }
 
-    public bool IsDirty
-    {
-        get
-        {
+    public bool IsDirty {
+        get {
             Dirty deedsdonedirtcheap = this.GetComponent<Dirty>();
-            if (deedsdonedirtcheap != null)
-            {
+            if (deedsdonedirtcheap != null) {
                 return deedsdonedirtcheap.IsDirty();
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
-    public bool IsCooked
-    {
-        get
-        {
+    public bool IsCooked {
+        get {
             CookObject tasty = this.GetComponent<CookObject>();
-            if (tasty != null)
-            {
+            if (tasty != null) {
                 return tasty.IsCooked();
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
@@ -766,54 +659,42 @@ public bool IsCooked
 
     // if the object has been sliced, the rest of it has been disabled so it can't be seen or interacted with, but the metadata
     // will still reflect it's last position at time of being sliced. This is similar to break
-    public bool IsSliced
-    {
-        get
-        {
+    public bool IsSliced {
+        get {
             SliceObject kars = this.GetComponent<SliceObject>();
-            if (kars != null)
-            {
+            if (kars != null) {
                 return kars.IsSliced();
-            }
-            else
-            {
+            } else {
                 return false;
             }
         }
     }
 
     /// these aren't in yet, just placeholder
-    public bool CanBeUsedUp
-    {
+    public bool CanBeUsedUp {
         get { return false; }
     }
-    public bool IsUsedUp
-    {
+    public bool IsUsedUp {
         get { return false; }
     }
 
     /// end placeholder stuff
 
     // return temperature enum here
-    public Temperature CurrentObjTemp
-    {
+    public Temperature CurrentObjTemp {
         get { return CurrentTemperature; }
     }
 
-    private void FindMySpawnPoints(BaseFPSAgentController agent = null)
-    {
+    private void FindMySpawnPoints(BaseFPSAgentController agent = null) {
         List<ReceptacleSpawnPoint> temp = new List<ReceptacleSpawnPoint>();
-        foreach (GameObject rtb in ReceptacleTriggerBoxes)
-        {
+        foreach (GameObject rtb in ReceptacleTriggerBoxes) {
             Contains containsScript = rtb.GetComponent<Contains>();
             temp.AddRange(containsScript.GetValidSpawnPoints(agent));
         }
 
-        if (agent != null)
-        {
+        if (agent != null) {
             temp.Sort(
-                delegate(ReceptacleSpawnPoint one, ReceptacleSpawnPoint two)
-                {
+                delegate (ReceptacleSpawnPoint one, ReceptacleSpawnPoint two) {
                     return Vector3
                         .Distance(agent.transform.position, one.Point)
                         .CompareTo(Vector3.Distance(agent.transform.position, two.Point));
@@ -828,11 +709,9 @@ private void FindMySpawnPoints(BaseFPSAgentController agent = null)
     public List<Vector3> FindMySpawnPointsFromTriggerBox(
         bool forceVisible = false,
         bool top = false
-    )
-    {
+    ) {
         List<Vector3> points = new List<Vector3>();
-        foreach (GameObject rtb in ReceptacleTriggerBoxes)
-        {
+        foreach (GameObject rtb in ReceptacleTriggerBoxes) {
             points.AddRange(
                 rtb.GetComponent<Contains>().GetValidSpawnPointsFromTriggerBox(top: top)
             );
@@ -845,11 +724,9 @@ public List<Vector3> FindMySpawnPointsFromTriggerBox(
     public List<Vector3> FindMySpawnPointsFromTriggerBoxInLocalSpace(
         bool forceVisible = false,
         bool top = false
-    )
-    {
+    ) {
         List<Vector3> points = new List<Vector3>();
-        foreach (GameObject rtb in ReceptacleTriggerBoxes)
-        {
+        foreach (GameObject rtb in ReceptacleTriggerBoxes) {
             points.AddRange(
                 rtb.GetComponent<Contains>().GetValidSpawnPointsFromTriggerBoxLocalSpace(top: top)
             );
@@ -860,42 +737,33 @@ public List<Vector3> FindMySpawnPointsFromTriggerBoxInLocalSpace(
 
     // set ReturnPointsCloseToAgent to true if only points near the agent are wanted
     // set to false if all potential points on the object are wanted
-    public List<ReceptacleSpawnPoint> ReturnMySpawnPoints(BaseFPSAgentController agent = null)
-    {
+    public List<ReceptacleSpawnPoint> ReturnMySpawnPoints(BaseFPSAgentController agent = null) {
         FindMySpawnPoints(agent);
         return MySpawnPoints;
     }
 
-    public void ResetContactPointsDictionary()
-    {
+    public void ResetContactPointsDictionary() {
         contactPointsDictionary.Clear();
     }
 
-    void OnCollisionEnter(Collision col)
-    {
+    void OnCollisionEnter(Collision col) {
         // this is to enable kinematics if this object hits another object that isKinematic but needs to activate
         // physics uppon being touched/collided
 
-        if (droneFPSAgent == null)
-        {
+        if (droneFPSAgent == null) {
             return;
         }
 
         // GameObject agent = GameObject.Find("FPSController");
-        if (col.transform.GetComponentInParent<SimObjPhysics>())
-        {
+        if (col.transform.GetComponentInParent<SimObjPhysics>()) {
             // add a check for if it's for initialization
-            if (droneFPSAgent.HasLaunch(this))
-            {
+            if (droneFPSAgent.HasLaunch(this)) {
                 // add a check for if this is the object caought by the drone
-                if (!droneFPSAgent.isObjectCaught(this))
-                {
+                if (!droneFPSAgent.isObjectCaught(this)) {
                     // emperically find the relative velocity > 1 means a "real" hit.
-                    if (col.relativeVelocity.magnitude > 1)
-                    {
+                    if (col.relativeVelocity.magnitude > 1) {
                         // make sure we only count hit once per time, not for all collision contact points of an object.
-                        if (!contactPointsDictionary.ContainsKey(col.collider))
-                        {
+                        if (!contactPointsDictionary.ContainsKey(col.collider)) {
                             numSimObjHit++;
                         }
                     }
@@ -903,27 +771,21 @@ void OnCollisionEnter(Collision col)
             }
         }
         // add a check for if the hitting one is a structure object
-        else if (col.transform.GetComponentInParent<StructureObject>())
-        {
+        else if (col.transform.GetComponentInParent<StructureObject>()) {
             // add a check for if it's for initialization
-            if (droneFPSAgent.HasLaunch(this))
-            {
+            if (droneFPSAgent.HasLaunch(this)) {
                 // add a check for if this is the object caought by the drone
-                if (!droneFPSAgent.isObjectCaught(this))
-                {
+                if (!droneFPSAgent.isObjectCaught(this)) {
                     // emperically find the relative velocity > 1 means a "real" hit.
-                    if (col.relativeVelocity.magnitude > 1)
-                    {
+                    if (col.relativeVelocity.magnitude > 1) {
                         // make sure we only count hit once per time, not for all collision contact points of an object.
-                        if (!contactPointsDictionary.ContainsKey(col.collider))
-                        {
+                        if (!contactPointsDictionary.ContainsKey(col.collider)) {
                             numStructureHit++;
                             // check if structure hit is a floor
                             if (
                                 col.transform.GetComponentInParent<StructureObject>().WhatIsMyStructureObjectTag
                                 == StructureObjectTag.Floor
-                            )
-                            {
+                            ) {
                                 numFloorHit++;
                             }
                         }
@@ -935,16 +797,14 @@ void OnCollisionEnter(Collision col)
         contactPointsDictionary[col.collider] = col.contacts;
     }
 
-    void OnCollisionExit(Collision col)
-    {
+    void OnCollisionExit(Collision col) {
         contactPointsDictionary.Remove(col.collider);
     }
 
 #if UNITY_EDITOR
 
     [UnityEditor.MenuItem("SimObjectPhysics/Create RB Collider")]
-    public static void CreateRBCollider()
-    {
+    public static void CreateRBCollider() {
         GameObject prefabRoot = Selection.activeGameObject;
         // print(prefabRoot.name);
 
@@ -966,18 +826,15 @@ public static void CreateRBCollider()
     }
 
     [UnityEditor.MenuItem("SimObjectPhysics/Change All Lights to Soft")]
-    public static void AllOfTheLights()
-    {
+    public static void AllOfTheLights() {
         Light[] lights = FindObjectsOfType(typeof(Light)) as Light[];
-        foreach (Light l in lights)
-        {
+        foreach (Light l in lights) {
             l.shadows = LightShadows.Soft;
         }
     }
 
     [UnityEditor.MenuItem("SimObjectPhysics/Create Sim Obj from Mesh &r")]
-    public static void CreateFromMesh()
-    {
+    public static void CreateFromMesh() {
         GameObject prefabRoot = Selection.activeGameObject;
         GameObject top = new GameObject(prefabRoot.name);
         top.transform.position = prefabRoot.transform.position;
@@ -992,48 +849,41 @@ public static void CreateFromMesh()
     }
 
     [UnityEditor.MenuItem("SimObjectPhysics/Set Transform Scale to 1 &e")]
-    public static void ResetTransformScale()
-    {
+    public static void ResetTransformScale() {
         GameObject selected = Selection.activeGameObject;
 
         List<Transform> selectedchildren = new List<Transform>();
 
-        foreach (Transform t in selected.transform)
-        {
+        foreach (Transform t in selected.transform) {
             // print(t.name);
             selectedchildren.Add(t);
             // t.SetParent(null);
         }
 
-        foreach (Transform yes in selectedchildren)
-        {
+        foreach (Transform yes in selectedchildren) {
             yes.SetParent(null);
         }
 
         selected.transform.localScale = new Vector3(1, 1, 1);
 
-        foreach (Transform t in selectedchildren)
-        {
+        foreach (Transform t in selectedchildren) {
             t.SetParent(selected.transform);
         }
     }
 
     [UnityEditor.MenuItem("SimObjectPhysics/Set All Transforms to Defaults &d")]
-    public static void ResetTransform()
-    {
+    public static void ResetTransform() {
         GameObject selected = Selection.activeGameObject;
 
         List<Transform> selectedchildren = new List<Transform>();
 
-        foreach (Transform t in selected.transform)
-        {
+        foreach (Transform t in selected.transform) {
             // print(t.name);
             selectedchildren.Add(t);
             // t.SetParent(null);
         }
 
-        foreach (Transform yes in selectedchildren)
-        {
+        foreach (Transform yes in selectedchildren) {
             yes.SetParent(null);
         }
 
@@ -1041,28 +891,24 @@ public static void ResetTransform()
         selected.transform.localRotation = new Quaternion(0, 0, 0, 0);
         selected.transform.localScale = new Vector3(1, 1, 1);
 
-        foreach (Transform t in selectedchildren)
-        {
+        foreach (Transform t in selectedchildren) {
             t.SetParent(selected.transform);
         }
     }
 
     [UnityEditor.MenuItem("SimObjectPhysics/Rotate Box Flap 90 on Y &s")]
-    public static void RotateTheBoxFlap()
-    {
+    public static void RotateTheBoxFlap() {
         GameObject selected = Selection.activeGameObject;
 
         List<Transform> selectedchildren = new List<Transform>();
 
-        foreach (Transform t in selected.transform)
-        {
+        foreach (Transform t in selected.transform) {
             // print(t.name);
             selectedchildren.Add(t);
             // t.SetParent(null);
         }
 
-        foreach (Transform yes in selectedchildren)
-        {
+        foreach (Transform yes in selectedchildren) {
             yes.SetParent(null);
         }
 
@@ -1073,15 +919,13 @@ public static void RotateTheBoxFlap()
         selected.transform.localRotation = Quaternion.Euler(setrot + new Vector3(-180, 180, 180)); // This is weird and we don't know why
         selected.transform.localScale = new Vector3(1, 1, 1);
 
-        foreach (Transform t in selectedchildren)
-        {
+        foreach (Transform t in selectedchildren) {
             t.SetParent(selected.transform);
         }
     }
 #endif
 
-    private void initializeProperties()
-    {
+    private void initializeProperties() {
         this.IsReceptacle =
             Array.IndexOf(SecondaryProperties, SimObjSecondaryProperty.Receptacle) > -1
             && ReceptacleTriggerBoxes != null;
@@ -1104,44 +948,35 @@ private void initializeProperties()
     }
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         // For debug in editor only
 #if UNITY_EDITOR
         List<SimObjSecondaryProperty> temp = new List<SimObjSecondaryProperty>(SecondaryProperties);
-        if (temp.Contains(SimObjSecondaryProperty.Receptacle))
-        {
-            if (ReceptacleTriggerBoxes.Length == 0)
-            {
+        if (temp.Contains(SimObjSecondaryProperty.Receptacle)) {
+            if (ReceptacleTriggerBoxes.Length == 0) {
                 Debug.LogError(
                     this.name + " is missing ReceptacleTriggerBoxes please hook them up"
                 );
             }
         }
 
-        if (temp.Contains(SimObjSecondaryProperty.ObjectSpecificReceptacle))
-        {
-            if (!gameObject.GetComponent<ObjectSpecificReceptacle>())
-            {
+        if (temp.Contains(SimObjSecondaryProperty.ObjectSpecificReceptacle)) {
+            if (!gameObject.GetComponent<ObjectSpecificReceptacle>()) {
                 Debug.LogError(this.name + " is missing the ObjectSpecificReceptacle component!");
             }
         }
 
-        if (this.tag != "SimObjPhysics")
-        {
+        if (this.tag != "SimObjPhysics") {
             Debug.LogError(this.name + " is missing SimObjPhysics tag!");
         }
 
-        if (IsPickupable || IsMoveable)
-        {
-            if (salientMaterials.Length == 0)
-            {
+        if (IsPickupable || IsMoveable) {
+            if (salientMaterials.Length == 0) {
                 Debug.LogError(this.name + " is missing Salient Materials array!");
             }
         }
 
-        if (this.transform.localScale != new Vector3(1, 1, 1))
-        {
+        if (this.transform.localScale != new Vector3(1, 1, 1)) {
             Debug.LogError(this.name + " is not at uniform scale! Set scale to (1, 1, 1)!!!");
         }
 #endif
@@ -1151,8 +986,7 @@ void Start()
             MyColliders.Length
         ];
 
-        for (int i = 0; i < MyColliders.Length; i++)
-        {
+        for (int i = 0; i < MyColliders.Length; i++) {
             OriginalPhysicsMaterialValuesForAllMyColliders[i] = new PhysicsMaterialValues(
                 MyColliders[i].material.dynamicFriction,
                 MyColliders[i].material.staticFriction,
@@ -1162,20 +996,17 @@ void Start()
 
         myRigidbody = gameObject.GetComponent<Rigidbody>();
         myRigidbody = gameObject.GetComponent<Rigidbody>();
-        if (myRigidbody != null)
-        {
+        if (myRigidbody != null) {
             Rigidbody rb = myRigidbody;
 
             RBoriginalAngularDrag = rb.angularDrag;
             RBoriginalDrag = rb.drag;
 
             //default all rigidbodies so that if their drag/angular drag is zero, it's at least nonzero
-            if (myRigidbody.drag == 0)
-            {
+            if (myRigidbody.drag == 0) {
                 myRigidbody.drag = 0.01f;
             }
-            if (myRigidbody.angularDrag == 0)
-            {
+            if (myRigidbody.angularDrag == 0) {
                 myRigidbody.angularDrag = 0.01f;
             }
         }
@@ -1189,12 +1020,9 @@ void Start()
         // Spawn Dirt Decal Surface if this object is setup for cleaning
         bool onlyForThisObject = this.gameObject.GetComponent<DirtAndWrite>();
 
-        if (onlyForThisObject)
-        {
-            if (sceneManager.placeDecalSurfaceOnReceptacles && this.IsReceptacle)
-            {
-                foreach (GameObject go in ReceptacleTriggerBoxes)
-                {
+        if (onlyForThisObject) {
+            if (sceneManager.placeDecalSurfaceOnReceptacles && this.IsReceptacle) {
+                foreach (GameObject go in ReceptacleTriggerBoxes) {
                     var dgo = GameObject.Instantiate(sceneManager.receptaclesDirtyDecalSurface);
                     // unity provided quad's mesh is XY plane, repplace with custom XZ one and remove line below
                     dgo.GetComponent<BoxCollider>().isTrigger = true;
@@ -1219,25 +1047,21 @@ public void SpawnDirtOnReceptacle(
         int howManyDirt,
         int randomSeed,
         DirtSpawnPosition[] spawnPoints = null
-    )
-    {
+    ) {
         DecalSpawner decalSpawner = this.gameObject.GetComponentInChildren<DecalSpawner>();
         decalSpawner.SpawnDirt(howManyDirt, randomSeed, spawnPoints);
     }
 
-    public DirtCoordinateBounds GetDirtCoordinateBounds()
-    {
+    public DirtCoordinateBounds GetDirtCoordinateBounds() {
         DecalSpawner decalSpawner = this.gameObject.GetComponentInChildren<DecalSpawner>();
         return decalSpawner.GetDirtCoordinateBounds();
     }
 
-    public bool DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty prop)
-    {
+    public bool DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty prop) {
         bool result = false;
         List<SimObjSecondaryProperty> temp = new List<SimObjSecondaryProperty>(SecondaryProperties);
 
-        if (temp.Contains(prop))
-        {
+        if (temp.Contains(prop)) {
             result = true;
         }
 
@@ -1245,16 +1069,13 @@ public bool DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty prop
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         if (sceneManager.AllowDecayTemperature) // only do this if the scene is initialized to use Temperature decay over time
         {
             // if this object is either hot or col, begin a timer that counts until the object becomes room temperature again
-            if (CurrentTemperature != Temperature.RoomTemp && StartRoomTempTimer == true)
-            {
+            if (CurrentTemperature != Temperature.RoomTemp && StartRoomTempTimer == true) {
                 HowManySecondsUntilRoomTemp -= Time.deltaTime;
-                if (HowManySecondsUntilRoomTemp < 0)
-                {
+                if (HowManySecondsUntilRoomTemp < 0) {
                     CurrentTemperature = Temperature.RoomTemp;
                     HowManySecondsUntilRoomTemp = TimerResetValue;
                 }
@@ -1264,8 +1085,7 @@ void Update()
         }
     }
 
-    void LateUpdate()
-    {
+    void LateUpdate() {
         // only update lastVelocity if physicsAutosimulation = true, otherwise let the Advance Physics function take care of it;
         if (sceneManager.physicsSimulationPaused == false && myRigidbody != null)
         // record this object's current velocity
@@ -1277,13 +1097,11 @@ void LateUpdate()
     }
 
     // used for throwing the sim object, or anything that requires adding force for some reason
-    public void ApplyForce(ServerAction action)
-    {
+    public void ApplyForce(ServerAction action) {
         Vector3 dir = new Vector3(action.x, action.y, action.z);
         Rigidbody myrb = gameObject.GetComponent<Rigidbody>();
 
-        if (myrb.IsSleeping())
-        {
+        if (myrb.IsSleeping()) {
             myrb.WakeUp();
         }
 
@@ -1293,12 +1111,10 @@ public void ApplyForce(ServerAction action)
     }
 
     // overload that doesn't use a server action
-    public void ApplyForce(Vector3 dir, float magnitude)
-    {
+    public void ApplyForce(Vector3 dir, float magnitude) {
         Rigidbody myrb = gameObject.GetComponent<Rigidbody>();
 
-        if (myrb.IsSleeping())
-        {
+        if (myrb.IsSleeping()) {
             myrb.WakeUp();
         }
 
@@ -1308,22 +1124,16 @@ public void ApplyForce(Vector3 dir, float magnitude)
     }
 
     // return all sim objects contained by this object if it is a receptacle
-    public List<SimObjPhysics> GetAllSimObjectsInReceptacleTriggers()
-    {
+    public List<SimObjPhysics> GetAllSimObjectsInReceptacleTriggers() {
         List<SimObjPhysics> objs = new List<SimObjPhysics>();
 
-        if (DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-        {
-            if (ReceptacleTriggerBoxes != null)
-            {
-                foreach (GameObject go in ReceptacleTriggerBoxes)
-                {
+        if (DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
+            if (ReceptacleTriggerBoxes != null) {
+                foreach (GameObject go in ReceptacleTriggerBoxes) {
                     foreach (
                         SimObjPhysics sop in go.GetComponent<Contains>().CurrentlyContainedObjects()
-                    )
-                    {
-                        if (!objs.Contains(sop))
-                        {
+                    ) {
+                        if (!objs.Contains(sop)) {
                             // print(sop.transform.name);
                             objs.Add(sop);
                         }
@@ -1336,20 +1146,14 @@ SimObjPhysics sop in go.GetComponent<Contains>().CurrentlyContainedObjects()
     }
 
     // return all sim objects by object ID contained by this object if it is a receptacle
-    public List<string> GetAllSimObjectsInReceptacleTriggersByObjectID()
-    {
+    public List<string> GetAllSimObjectsInReceptacleTriggersByObjectID() {
         List<string> objs = new List<string>();
 
-        if (DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle))
-        {
-            if (ReceptacleTriggerBoxes != null)
-            {
-                foreach (GameObject go in ReceptacleTriggerBoxes)
-                {
-                    foreach (string s in go.GetComponent<Contains>().CurrentlyContainedObjectIDs())
-                    {
-                        if (!objs.Contains(s))
-                        {
+        if (DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.Receptacle)) {
+            if (ReceptacleTriggerBoxes != null) {
+                foreach (GameObject go in ReceptacleTriggerBoxes) {
+                    foreach (string s in go.GetComponent<Contains>().CurrentlyContainedObjectIDs()) {
+                        if (!objs.Contains(s)) {
                             // print(sop.transform.name);
                             objs.Add(s);
                         }
@@ -1361,21 +1165,16 @@ public List<string> GetAllSimObjectsInReceptacleTriggersByObjectID()
         return objs;
     }
 
-    public List<GameObject> ContainedGameObjects()
-    {
+    public List<GameObject> ContainedGameObjects() {
         List<GameObject> objs = new List<GameObject>();
 
         // get box collider dimensions of ReceptacleTriggerBox if this is a receptacle
-        if (IsReceptacle)
-        {
-            foreach (GameObject rtb in ReceptacleTriggerBoxes)
-            {
+        if (IsReceptacle) {
+            foreach (GameObject rtb in ReceptacleTriggerBoxes) {
                 foreach (
                     GameObject g in rtb.GetComponent<Contains>().CurrentlyContainedGameObjects()
-                )
-                {
-                    if (!objs.Contains(g))
-                    {
+                ) {
+                    if (!objs.Contains(g)) {
                         objs.Add(g);
                     }
                 }
@@ -1389,16 +1188,14 @@ GameObject g in rtb.GetComponent<Contains>().CurrentlyContainedGameObjects()
         return objs;
     }
 
-    public void OnTriggerEnter(Collider other)
-    {
+    public void OnTriggerEnter(Collider other) {
         // is colliding only needs to be set for pickupable objects. Also drag/friction values only need to change for pickupable objects not all sim objects
         if (
             (
                 PrimaryProperty == SimObjPrimaryProperty.CanPickup
                 || PrimaryProperty == SimObjPrimaryProperty.Moveable
             )
-        )
-        {
+        ) {
             if (other.CompareTag("HighFriction")) //&& (PrimaryProperty == SimObjPrimaryProperty.CanPickup || PrimaryProperty == SimObjPrimaryProperty.Moveable))
             {
                 Rigidbody rb = gameObject.GetComponent<Rigidbody>();
@@ -1407,8 +1204,7 @@ public void OnTriggerEnter(Collider other)
                 rb.drag = HFrbdrag;
                 rb.angularDrag = HFrbangulardrag;
 
-                foreach (Collider col in MyColliders)
-                {
+                foreach (Collider col in MyColliders) {
                     col.material.dynamicFriction = HFdynamicfriction;
                     col.material.staticFriction = HFstaticfriction;
                     col.material.bounciness = HFbounciness;
@@ -1417,16 +1213,14 @@ public void OnTriggerEnter(Collider other)
         }
     }
 
-    public void OnTriggerExit(Collider other)
-    {
+    public void OnTriggerExit(Collider other) {
         if (
             other.CompareTag("HighFriction")
             && (
                 PrimaryProperty == SimObjPrimaryProperty.CanPickup
                 || PrimaryProperty == SimObjPrimaryProperty.Moveable
             )
-        )
-        {
+        ) {
             // print( "resetting to default trigger exit");
 
             Rigidbody rb = gameObject.GetComponent<Rigidbody>();
@@ -1434,8 +1228,7 @@ public void OnTriggerExit(Collider other)
             rb.drag = RBoriginalDrag;
             rb.angularDrag = RBoriginalAngularDrag;
 
-            for (int i = 0; i < MyColliders.Length; i++)
-            {
+            for (int i = 0; i < MyColliders.Length; i++) {
                 MyColliders[i].material.dynamicFriction =
                     OriginalPhysicsMaterialValuesForAllMyColliders[i].DynamicFriction;
                 MyColliders[i].material.staticFriction =
@@ -1452,8 +1245,7 @@ public void BeingPickedUpByArticulatedAgent(
         ArticulatedArmController arm,
         float breakForce = 20.0f,
         float breakTorque = 20.0f
-    )
-    {
+    ) {
         articulatedArmHoldingMe = arm;
         myRigidbody.isKinematic = false;
 
@@ -1468,8 +1260,7 @@ public void BeingPickedUpByArticulatedAgent(
     }
 
     //callback for when joint breaks due to force
-    public void OnJointBreak(float breakForce)
-    {
+    public void OnJointBreak(float breakForce) {
         Debug.Log("A joint has just been broken!, force: " + breakForce);
         BeingDropped();
         //remove just this from held objects in case like, we picked up multiple things
@@ -1477,15 +1268,11 @@ public void OnJointBreak(float breakForce)
         articulatedArmHoldingMe.heldObjects.Remove(this);
     }
 
-    public void BeingDropped()
-    {
+    public void BeingDropped() {
         GameObject topObject = GameObject.Find("Objects");
-        if (topObject != null)
-        {
+        if (topObject != null) {
             this.transform.parent = topObject.transform;
-        }
-        else
-        {
+        } else {
             this.transform.parent = null;
         }
 
@@ -1497,14 +1284,12 @@ public void BeingDropped()
     }
 
 #if UNITY_EDITOR
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.white;
 
         // if this object is in visibile range and not blocked by any other object, it is visible
         // visible drawn in yellow
-        if (debugIsVisible == true && gameObject.GetComponentInChildren<MeshFilter>())
-        {
+        if (debugIsVisible == true && gameObject.GetComponentInChildren<MeshFilter>()) {
             MeshFilter mf = gameObject.GetComponentInChildren<MeshFilter>(false);
             Gizmos.color = Color.yellow;
             Gizmos.DrawWireMesh(
@@ -1517,8 +1302,7 @@ void OnDrawGizmos()
         }
 
         // interactable drawn in magenta
-        if (debugIsInteractable && gameObject.GetComponentInChildren<MeshFilter>())
-        {
+        if (debugIsInteractable && gameObject.GetComponentInChildren<MeshFilter>()) {
             MeshFilter mf = gameObject.GetComponentInChildren<MeshFilter>(false);
             Gizmos.color = Color.magenta;
             Gizmos.DrawWireMesh(
@@ -1532,10 +1316,8 @@ void OnDrawGizmos()
 
         // draw visibility points for editor
         Gizmos.color = Color.yellow;
-        if (VisibilityPoints != null && VisibilityPoints.Length > 0)
-        {
-            foreach (Transform t in VisibilityPoints)
-            {
+        if (VisibilityPoints != null && VisibilityPoints.Length > 0) {
+            foreach (Transform t in VisibilityPoints) {
                 // if (t != null)
                 //{
                 Gizmos.DrawSphere(t.position, 0.01f);
@@ -1553,8 +1335,7 @@ void OnDrawGizmos()
     // RIGHT CLICK this script in the inspector to reveal these options
 
     //[ContextMenu("Cabinet")]
-    void SetUpCabinet()
-    {
+    void SetUpCabinet() {
         Type = SimObjType.Cabinet;
         PrimaryProperty = SimObjPrimaryProperty.Static;
 
@@ -1565,15 +1346,13 @@ void SetUpCabinet()
         gameObject.transform.tag = "SimObjPhysics";
         gameObject.layer = 8;
 
-        if (!gameObject.GetComponent<Rigidbody>())
-        {
+        if (!gameObject.GetComponent<Rigidbody>()) {
             gameObject.AddComponent<Rigidbody>();
         }
 
         this.GetComponent<Rigidbody>().isKinematic = true;
 
-        if (!gameObject.GetComponent<CanOpen_Object>())
-        {
+        if (!gameObject.GetComponent<CanOpen_Object>()) {
             gameObject.AddComponent<CanOpen_Object>();
             gameObject.GetComponent<CanOpen_Object>().SetMovementToRotate();
         }
@@ -1592,8 +1371,7 @@ void SetUpCabinet()
 
         Transform door = transform.Find("CabinetDoor");
 
-        if (!gameObject.transform.Find("StaticVisPoints"))
-        {
+        if (!gameObject.transform.Find("StaticVisPoints")) {
             GameObject svp = new GameObject("StaticVisPoints");
             svp.transform.position = gameObject.transform.position;
             svp.transform.SetParent(gameObject.transform);
@@ -1603,8 +1381,7 @@ void SetUpCabinet()
             vp.transform.SetParent(svp.transform);
         }
 
-        if (!door.Find("Colliders"))
-        {
+        if (!door.Find("Colliders")) {
             GameObject col = new GameObject("Colliders");
             col.transform.position = door.position;
             col.transform.SetParent(door);
@@ -1617,8 +1394,7 @@ void SetUpCabinet()
             coll.transform.SetParent(col.transform);
         }
 
-        if (!door.Find("VisibilityPoints"))
-        {
+        if (!door.Find("VisibilityPoints")) {
             GameObject VisPoints = new GameObject("VisibilityPoints");
             VisPoints.transform.position = door.position;
             VisPoints.transform.SetParent(door);
@@ -1626,12 +1402,9 @@ void SetUpCabinet()
             GameObject vp = new GameObject("VisPoint");
             vp.transform.position = VisPoints.transform.position;
             vp.transform.SetParent(VisPoints.transform);
-        }
-        else
-        {
+        } else {
             Transform VisPoints = door.Find("VisibilityPoints");
-            foreach (Transform child in VisPoints)
-            {
+            foreach (Transform child in VisPoints) {
                 vpoints.Add(child);
                 child.gameObject.tag = "Untagged";
                 child.gameObject.layer = 8;
@@ -1639,59 +1412,44 @@ void SetUpCabinet()
         }
         ////////////////////////
 
-        foreach (Transform child in gameObject.transform)
-        {
-            if (child.name == "StaticVisPoints")
-            {
-                foreach (Transform svp in child)
-                {
-                    if (!vpoints.Contains(svp))
-                    {
+        foreach (Transform child in gameObject.transform) {
+            if (child.name == "StaticVisPoints") {
+                foreach (Transform svp in child) {
+                    if (!vpoints.Contains(svp)) {
                         vpoints.Add(svp);
                     }
                 }
             }
 
-            if (child.name == "ReceptacleTriggerBox")
-            {
+            if (child.name == "ReceptacleTriggerBox") {
                 // print("check");
-                if (!recepboxes.Contains(child.gameObject))
-                {
+                if (!recepboxes.Contains(child.gameObject)) {
                     recepboxes.Add(child.gameObject);
                 }
             }
 
             // found the cabinet door, go into it and populate triggerboxes, colliders, t colliders, and vis points
-            if (child.name == "CabinetDoor")
-            {
-                if (child.GetComponent<Rigidbody>())
-                {
+            if (child.name == "CabinetDoor") {
+                if (child.GetComponent<Rigidbody>()) {
                     DestroyImmediate(child.GetComponent<Rigidbody>(), true);
                 }
 
-                if (child.GetComponent<SimObjPhysics>())
-                {
+                if (child.GetComponent<SimObjPhysics>()) {
                     DestroyImmediate(child.GetComponent<SimObjPhysics>(), true);
                 }
 
-                if (!movparts.Contains(child.gameObject))
-                {
+                if (!movparts.Contains(child.gameObject)) {
                     movparts.Add(child.gameObject);
                 }
 
-                foreach (Transform c in child)
-                {
-                    if (c.name == "Colliders")
-                    {
-                        foreach (Transform col in c)
-                        {
-                            if (!cols.Contains(col.gameObject))
-                            {
+                foreach (Transform c in child) {
+                    if (c.name == "Colliders") {
+                        foreach (Transform col in c) {
+                            if (!cols.Contains(col.gameObject)) {
                                 cols.Add(col.gameObject);
                             }
 
-                            if (col.childCount == 0)
-                            {
+                            if (col.childCount == 0) {
                                 GameObject prefabRoot = col.gameObject;
 
                                 GameObject inst = Instantiate(
@@ -1723,12 +1481,9 @@ void SetUpCabinet()
                     // 	}
                     // }
 
-                    if (c.name == "VisibilityPoints")
-                    {
-                        foreach (Transform col in c)
-                        {
-                            if (!vpoints.Contains(col.transform))
-                            {
+                    if (c.name == "VisibilityPoints") {
+                        foreach (Transform col in c) {
+                            if (!vpoints.Contains(col.transform)) {
                                 vpoints.Add(col.transform);
                             }
                         }
@@ -1746,8 +1501,7 @@ void SetUpCabinet()
         gameObject.GetComponent<CanOpen_Object>().openPositions = new Vector3[movparts.Count];
         gameObject.GetComponent<CanOpen_Object>().closedPositions = new Vector3[movparts.Count];
 
-        if (openPositions.Count != 0)
-        {
+        if (openPositions.Count != 0) {
             gameObject.GetComponent<CanOpen_Object>().openPositions = openPositions.ToArray();
         }
 
@@ -1755,8 +1509,7 @@ void SetUpCabinet()
     }
 
     //[ContextMenu("Table")]
-    void SetUpTable()
-    {
+    void SetUpTable() {
         this.Type = SimObjType.DiningTable;
         this.PrimaryProperty = SimObjPrimaryProperty.Static;
         this.SecondaryProperties = new SimObjSecondaryProperty[]
@@ -1768,8 +1521,7 @@ void SetUpTable()
 
         // GameObject inst = Instantiate(new GameObject(), gameObject.transform, true);
         // inst.AddComponent<BoxCollider>();
-        if (!gameObject.transform.Find("BoundingBox"))
-        {
+        if (!gameObject.transform.Find("BoundingBox")) {
             GameObject bb = new GameObject("BoundingBox");
             bb.transform.position = gameObject.transform.position;
             bb.transform.SetParent(gameObject.transform);
@@ -1783,10 +1535,8 @@ void SetUpTable()
 
         List<GameObject> recepboxes = new List<GameObject>();
 
-        foreach (Transform t in gameObject.transform)
-        {
-            if (t.GetComponent<Contains>())
-            {
+        foreach (Transform t in gameObject.transform) {
+            if (t.GetComponent<Contains>()) {
                 recepboxes.Add(t.gameObject);
             }
         }
@@ -1795,8 +1545,7 @@ void SetUpTable()
     }
 
     [ContextMenu("Setup Floor")]
-    void FloorSetupContext()
-    {
+    void FloorSetupContext() {
         this.Type = SimObjType.Floor;
         this.PrimaryProperty = SimObjPrimaryProperty.Static;
 
@@ -1805,8 +1554,7 @@ void FloorSetupContext()
             SimObjSecondaryProperty.Receptacle
         };
 
-        if (!gameObject.GetComponent<Rigidbody>())
-        {
+        if (!gameObject.GetComponent<Rigidbody>()) {
             gameObject.AddComponent<Rigidbody>();
         }
 
@@ -1828,8 +1576,7 @@ void FloorSetupContext()
     }
 
     //[ContextMenu("Drawer")]
-    void SetUpDrawer()
-    {
+    void SetUpDrawer() {
         this.Type = SimObjType.Drawer;
         this.PrimaryProperty = SimObjPrimaryProperty.Static;
         this.SecondaryProperties = new SimObjSecondaryProperty[]
@@ -1843,8 +1590,7 @@ void SetUpDrawer()
         // delete the trigger colliders and bounding box here
         // also probably edit ContextSetupSimObjPhysics to not create trigger colliders anymore
 
-        if (!gameObject.GetComponent<CanOpen_Object>())
-        {
+        if (!gameObject.GetComponent<CanOpen_Object>()) {
             gameObject.AddComponent<CanOpen_Object>();
         }
         CanOpen_Object coo = gameObject.GetComponent<CanOpen_Object>();
@@ -1859,18 +1605,14 @@ void SetUpDrawer()
 
         List<GameObject> recepboxes = new List<GameObject>();
 
-        foreach (Transform t in gameObject.transform)
-        {
-            if (t.name == "BoundingBox")
-            {
+        foreach (Transform t in gameObject.transform) {
+            if (t.name == "BoundingBox") {
                 DestroyImmediate(t.gameObject, true);
                 break;
             }
 
-            if (t.name == "ReceptacleTriggerBox")
-            {
-                if (!recepboxes.Contains(t.gameObject))
-                {
+            if (t.name == "ReceptacleTriggerBox") {
+                if (!recepboxes.Contains(t.gameObject)) {
                     recepboxes.Add(t.gameObject);
                 }
             }
@@ -1908,14 +1650,12 @@ void SetUpDrawer()
     }
 
     //[ContextMenu("Find BoundingBox")]
-    void ContextFindBoundingBox()
-    {
+    void ContextFindBoundingBox() {
         BoundingBox = gameObject.transform.Find("BoundingBox").gameObject;
     }
 
     //[ContextMenu("Set Up Microwave")]
-    void ContextSetUpMicrowave()
-    {
+    void ContextSetUpMicrowave() {
         this.Type = SimObjType.Microwave;
         this.PrimaryProperty = SimObjPrimaryProperty.Static;
 
@@ -1923,8 +1663,7 @@ void ContextSetUpMicrowave()
         this.SecondaryProperties[0] = SimObjSecondaryProperty.Receptacle;
         this.SecondaryProperties[1] = SimObjSecondaryProperty.CanOpen;
 
-        if (!gameObject.transform.Find("BoundingBox"))
-        {
+        if (!gameObject.transform.Find("BoundingBox")) {
             GameObject bb = new GameObject("BoundingBox");
             bb.transform.position = gameObject.transform.position;
             bb.transform.SetParent(gameObject.transform);
@@ -1934,21 +1673,17 @@ void ContextSetUpMicrowave()
             bb.layer = 0;
 
             BoundingBox = bb;
-        }
-        else
-        {
+        } else {
             BoundingBox = gameObject.transform.Find("BoundingBox").gameObject;
         }
 
-        if (!gameObject.GetComponent<CanOpen_Object>())
-        {
+        if (!gameObject.GetComponent<CanOpen_Object>()) {
             gameObject.AddComponent<CanOpen_Object>();
         }
 
         List<Transform> vplist = new List<Transform>();
 
-        if (!gameObject.transform.Find("StaticVisPoints"))
-        {
+        if (!gameObject.transform.Find("StaticVisPoints")) {
             GameObject svp = new GameObject("StaticVisPoints");
             svp.transform.position = gameObject.transform.position;
             svp.transform.SetParent(gameObject.transform);
@@ -1956,12 +1691,9 @@ void ContextSetUpMicrowave()
             GameObject vp = new GameObject("vPoint");
             vp.transform.position = svp.transform.position;
             vp.transform.SetParent(svp.transform);
-        }
-        else
-        {
+        } else {
             Transform vp = gameObject.transform.Find("StaticVisPoints");
-            foreach (Transform child in vp)
-            {
+            foreach (Transform child in vp) {
                 vplist.Add(child);
 
                 // set correct tag and layer for each object
@@ -1971,8 +1703,7 @@ void ContextSetUpMicrowave()
         }
 
         Transform door = gameObject.transform.Find("Door");
-        if (!door.Find("Col"))
-        {
+        if (!door.Find("Col")) {
             GameObject col = new GameObject("Col");
             col.transform.position = door.transform.position;
             col.transform.SetParent(door.transform);
@@ -1983,8 +1714,7 @@ void ContextSetUpMicrowave()
             col.layer = 8;
         }
 
-        if (!door.Find("VisPoints"))
-        {
+        if (!door.Find("VisPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisPoints");
             vp.transform.position = door.transform.position;
@@ -1994,12 +1724,9 @@ void ContextSetUpMicrowave()
             GameObject vpc = new GameObject("vPoint");
             vpc.transform.position = vp.transform.position;
             vpc.transform.SetParent(vp.transform);
-        }
-        else
-        {
+        } else {
             Transform vp = door.Find("VisPoints");
-            foreach (Transform child in vp)
-            {
+            foreach (Transform child in vp) {
                 vplist.Add(child);
 
                 // set correct tag and layer for each object
@@ -2016,8 +1743,7 @@ void ContextSetUpMicrowave()
         coo.closedPositions = new Vector3[] { Vector3.zero };
         coo.SetMovementToRotate();
 
-        if (gameObject.transform.Find("ReceptacleTriggerBox"))
-        {
+        if (gameObject.transform.Find("ReceptacleTriggerBox")) {
             GameObject[] rtb = new GameObject[]
             {
                 gameObject.transform.Find("ReceptacleTriggerBox").transform.gameObject
@@ -2027,13 +1753,11 @@ void ContextSetUpMicrowave()
     }
 
     //[ContextMenu("Static Mesh Collider with Receptacle")]
-    void SetUpSimObjWithStaticMeshCollider()
-    {
+    void SetUpSimObjWithStaticMeshCollider() {
         if (
             this.Type == SimObjType.Undefined
             || this.PrimaryProperty == SimObjPrimaryProperty.Undefined
-        )
-        {
+        ) {
             Debug.Log("Type / Primary Property is missing");
             return;
         }
@@ -2041,14 +1765,12 @@ void SetUpSimObjWithStaticMeshCollider()
         gameObject.tag = "SimObjPhysics";
         gameObject.layer = 8;
 
-        if (!gameObject.GetComponent<Rigidbody>())
-        {
+        if (!gameObject.GetComponent<Rigidbody>()) {
             gameObject.AddComponent<Rigidbody>();
         }
 
         gameObject.GetComponent<Rigidbody>().isKinematic = true;
-        if (!gameObject.transform.Find("VisibilityPoints"))
-        {
+        if (!gameObject.transform.Find("VisibilityPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisibilityPoints");
             vp.transform.position = gameObject.transform.position;
@@ -2060,8 +1782,7 @@ void SetUpSimObjWithStaticMeshCollider()
             vpc.transform.SetParent(vp.transform);
         }
 
-        if (!gameObject.transform.Find("BoundingBox"))
-        {
+        if (!gameObject.transform.Find("BoundingBox")) {
             GameObject rac = new GameObject("BoundingBox");
             rac.transform.position = gameObject.transform.position;
             rac.transform.SetParent(gameObject.transform);
@@ -2071,26 +1792,21 @@ void SetUpSimObjWithStaticMeshCollider()
 
         List<GameObject> rtbList = new List<GameObject>();
 
-        foreach (Transform t in gameObject.transform)
-        {
-            if (t.GetComponent<MeshCollider>())
-            {
+        foreach (Transform t in gameObject.transform) {
+            if (t.GetComponent<MeshCollider>()) {
                 t.gameObject.tag = "SimObjPhysics";
                 t.gameObject.layer = 8;
 
                 // now check if it has pillows or something?
-                foreach (Transform yes in t)
-                {
-                    if (yes.GetComponent<MeshCollider>())
-                    {
+                foreach (Transform yes in t) {
+                    if (yes.GetComponent<MeshCollider>()) {
                         yes.gameObject.tag = "SimObjPhysics";
                         yes.gameObject.layer = 8;
                     }
                 }
             }
 
-            if (t.GetComponent<Contains>())
-            {
+            if (t.GetComponent<Contains>()) {
                 rtbList.Add(t.gameObject);
             }
         }
@@ -2102,8 +1818,7 @@ void SetUpSimObjWithStaticMeshCollider()
     }
 
     //[UnityEditor.MenuItem("SimObjectPhysics/AppleSlice")]
-    public static void ContextSetupAppleSlice()
-    {
+    public static void ContextSetupAppleSlice() {
         GameObject prefabRoot = Selection.activeGameObject;
         GameObject c = new GameObject("AppleSlice");
         c.transform.position = prefabRoot.transform.position;
@@ -2111,13 +1826,11 @@ public static void ContextSetupAppleSlice()
         prefabRoot.transform.SetParent(c.transform);
         prefabRoot.name = "Mesh";
 
-        if (!c.GetComponent<SimObjPhysics>())
-        {
+        if (!c.GetComponent<SimObjPhysics>()) {
             c.AddComponent<SimObjPhysics>();
         }
 
-        if (c.GetComponent<SimObjPhysics>())
-        {
+        if (c.GetComponent<SimObjPhysics>()) {
             SimObjPhysics sop = c.GetComponent<SimObjPhysics>();
             sop.PrimaryProperty = SimObjPrimaryProperty.CanPickup;
             sop.Type = SimObjType.AppleSliced;
@@ -2126,13 +1839,11 @@ public static void ContextSetupAppleSlice()
         c.tag = "SimObjPhysics";
         c.layer = 8;
 
-        if (!c.GetComponent<Rigidbody>())
-        {
+        if (!c.GetComponent<Rigidbody>()) {
             c.AddComponent<Rigidbody>();
         }
 
-        if (!c.transform.Find("Colliders"))
-        {
+        if (!c.transform.Find("Colliders")) {
             GameObject col = new GameObject("Colliders");
             col.transform.position = c.transform.position;
             col.transform.SetParent(c.transform);
@@ -2145,8 +1856,7 @@ public static void ContextSetupAppleSlice()
             cc.layer = 8;
         }
 
-        if (!c.transform.Find("VisibilityPoints"))
-        {
+        if (!c.transform.Find("VisibilityPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisibilityPoints");
             vp.transform.position = c.transform.position;
@@ -2158,8 +1868,7 @@ public static void ContextSetupAppleSlice()
             vpc.transform.SetParent(vp.transform);
         }
 
-        if (!c.transform.Find("BoundingBox"))
-        {
+        if (!c.transform.Find("BoundingBox")) {
             GameObject rac = new GameObject("BoundingBox");
             rac.transform.position = c.transform.position;
             rac.transform.SetParent(c.transform);
@@ -2171,21 +1880,18 @@ public static void ContextSetupAppleSlice()
     }
 
     //[UnityEditor.MenuItem("SimObjectPhysics/LightSwitch")]
-    public static void ContextSetupLightSwitch()
-    {
+    public static void ContextSetupLightSwitch() {
         GameObject prefabRoot = Selection.activeGameObject;
         GameObject c = new GameObject("LightSwitch");
         c.transform.position = prefabRoot.transform.position;
         prefabRoot.transform.SetParent(c.transform);
         prefabRoot.name = "Mesh";
 
-        if (!c.GetComponent<SimObjPhysics>())
-        {
+        if (!c.GetComponent<SimObjPhysics>()) {
             c.AddComponent<SimObjPhysics>();
         }
 
-        if (c.GetComponent<SimObjPhysics>())
-        {
+        if (c.GetComponent<SimObjPhysics>()) {
             SimObjPhysics sop = c.GetComponent<SimObjPhysics>();
             sop.PrimaryProperty = SimObjPrimaryProperty.Static;
             sop.Type = SimObjType.LightSwitch;
@@ -2199,14 +1905,12 @@ public static void ContextSetupLightSwitch()
         c.layer = 8;
         c.isStatic = true;
 
-        if (!c.GetComponent<Rigidbody>())
-        {
+        if (!c.GetComponent<Rigidbody>()) {
             Rigidbody rb = c.AddComponent<Rigidbody>();
             rb.isKinematic = true;
         }
 
-        if (!c.transform.Find("Colliders"))
-        {
+        if (!c.transform.Find("Colliders")) {
             GameObject col = new GameObject("Colliders");
             col.transform.position = c.transform.position;
             col.transform.SetParent(c.transform);
@@ -2219,8 +1923,7 @@ public static void ContextSetupLightSwitch()
             cc.layer = 8;
         }
 
-        if (!c.transform.Find("VisibilityPoints"))
-        {
+        if (!c.transform.Find("VisibilityPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisibilityPoints");
             vp.transform.position = c.transform.position;
@@ -2235,19 +1938,15 @@ public static void ContextSetupLightSwitch()
         c.GetComponent<SimObjPhysics>().SetupCollidersVisPoints();
 
         // add the CanToggleOnOff component and set it up with correct values
-        if (!c.GetComponent<CanToggleOnOff>())
-        {
+        if (!c.GetComponent<CanToggleOnOff>()) {
             CanToggleOnOff ctoo = c.AddComponent<CanToggleOnOff>();
 
             List<GameObject> childmeshes = new List<GameObject>();
             List<Vector3> childRotations = new List<Vector3>();
 
-            foreach (Transform t in c.transform)
-            {
-                if (t.name == "Mesh")
-                {
-                    foreach (Transform tt in t)
-                    {
+            foreach (Transform t in c.transform) {
+                if (t.name == "Mesh") {
+                    foreach (Transform tt in t) {
                         childmeshes.Add(tt.gameObject);
                         childRotations.Add(tt.transform.localEulerAngles);
                     }
@@ -2262,16 +1961,14 @@ public static void ContextSetupLightSwitch()
     }
 
     [ContextMenu("Setup Colliders, VisPoints, and Bounding Box")]
-    public void SetupCollidersVisPoints()
-    {
+    public void SetupCollidersVisPoints() {
         ContextSetUpColliders();
         ContextSetUpVisibilityPoints();
         ContextSetUpBoundingBox();
     }
 
     //[UnityEditor.MenuItem("SimObjectPhysics/Toaster")]
-    public static void ContextSetupToaster()
-    {
+    public static void ContextSetupToaster() {
         GameObject prefabRoot = Selection.activeGameObject;
         GameObject c = new GameObject("Toaster_");
         c.transform.position = prefabRoot.transform.position;
@@ -2279,13 +1976,11 @@ public static void ContextSetupToaster()
         prefabRoot.transform.SetParent(c.transform);
         prefabRoot.name = "Mesh";
 
-        if (!c.GetComponent<SimObjPhysics>())
-        {
+        if (!c.GetComponent<SimObjPhysics>()) {
             c.AddComponent<SimObjPhysics>();
         }
 
-        if (c.GetComponent<SimObjPhysics>())
-        {
+        if (c.GetComponent<SimObjPhysics>()) {
             SimObjPhysics sop = c.GetComponent<SimObjPhysics>();
             sop.PrimaryProperty = SimObjPrimaryProperty.Static;
             sop.Type = SimObjType.Toaster;
@@ -2295,13 +1990,11 @@ public static void ContextSetupToaster()
         c.tag = "SimObjPhysics";
         c.layer = 8;
 
-        if (!c.GetComponent<Rigidbody>())
-        {
+        if (!c.GetComponent<Rigidbody>()) {
             c.AddComponent<Rigidbody>();
         }
 
-        if (!c.transform.Find("Colliders"))
-        {
+        if (!c.transform.Find("Colliders")) {
             GameObject col = new GameObject("Colliders");
             col.transform.position = c.transform.position;
             col.transform.SetParent(c.transform);
@@ -2314,8 +2007,7 @@ public static void ContextSetupToaster()
             cc.layer = 8;
         }
 
-        if (!c.transform.Find("VisibilityPoints"))
-        {
+        if (!c.transform.Find("VisibilityPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisibilityPoints");
             vp.transform.position = c.transform.position;
@@ -2327,8 +2019,7 @@ public static void ContextSetupToaster()
             vpc.transform.SetParent(vp.transform);
         }
 
-        if (!c.transform.Find("BoundingBox"))
-        {
+        if (!c.transform.Find("BoundingBox")) {
             GameObject rac = new GameObject("BoundingBox");
             rac.transform.position = c.transform.position;
             rac.transform.SetParent(c.transform);
@@ -2340,32 +2031,24 @@ public static void ContextSetupToaster()
     }
 
     //[ContextMenu("Toaster Setup References")]
-    void ToasterSetupReferences()
-    {
+    void ToasterSetupReferences() {
         ContextSetUpColliders();
         ContextSetUpVisibilityPoints();
         ContextSetUpBoundingBox();
 
-        foreach (Transform t in gameObject.transform)
-        {
-            if (t.name == "Colliders")
-            {
-                if (!gameObject.transform.Find("TriggerColliders"))
-                {
+        foreach (Transform t in gameObject.transform) {
+            if (t.name == "Colliders") {
+                if (!gameObject.transform.Find("TriggerColliders")) {
                     GameObject inst = Instantiate(t.gameObject, gameObject.transform, true);
                     inst.name = "TriggerColliders";
-                    foreach (Transform yes in inst.transform)
-                    {
+                    foreach (Transform yes in inst.transform) {
                         yes.GetComponent<Collider>().isTrigger = true;
                     }
-                }
-                else
-                {
+                } else {
                     DestroyImmediate(gameObject.transform.Find("TriggerColliders").gameObject);
                     GameObject inst = Instantiate(t.gameObject, gameObject.transform, true);
                     inst.name = "TriggerColliders";
-                    foreach (Transform yes in inst.transform)
-                    {
+                    foreach (Transform yes in inst.transform) {
                         yes.GetComponent<Collider>().isTrigger = true;
                     }
                 }
@@ -2374,13 +2057,11 @@ void ToasterSetupReferences()
     }
 
     [ContextMenu("Setup")]
-    public void ContextSetUpSimObjPhysics()
-    {
+    public void ContextSetUpSimObjPhysics() {
         if (
             this.Type == SimObjType.Undefined
             || this.PrimaryProperty == SimObjPrimaryProperty.Undefined
-        )
-        {
+        ) {
             Debug.Log("Type / Primary Property is missing");
             return;
         }
@@ -2388,15 +2069,13 @@ public void ContextSetUpSimObjPhysics()
         gameObject.tag = "SimObjPhysics";
         gameObject.layer = 8;
 
-        if (!gameObject.GetComponent<Rigidbody>())
-        {
+        if (!gameObject.GetComponent<Rigidbody>()) {
             gameObject.AddComponent<Rigidbody>();
         }
 
         gameObject.GetComponent<Rigidbody>().isKinematic = true;
 
-        if (!gameObject.transform.Find("Colliders"))
-        {
+        if (!gameObject.transform.Find("Colliders")) {
             GameObject c = new GameObject("Colliders");
             c.transform.position = gameObject.transform.position;
             c.transform.SetParent(gameObject.transform);
@@ -2412,8 +2091,7 @@ public void ContextSetUpSimObjPhysics()
             cc.layer = 8;
         }
 
-        if (!gameObject.transform.Find("VisibilityPoints"))
-        {
+        if (!gameObject.transform.Find("VisibilityPoints")) {
             // empty to hold all visibility points
             GameObject vp = new GameObject("VisibilityPoints");
             vp.transform.position = gameObject.transform.position;
@@ -2427,8 +2105,7 @@ public void ContextSetUpSimObjPhysics()
             vpc.transform.localEulerAngles = Vector3.zero;
         }
 
-        if (!gameObject.transform.Find("BoundingBox"))
-        {
+        if (!gameObject.transform.Find("BoundingBox")) {
             GameObject rac = new GameObject("BoundingBox");
             rac.transform.position = gameObject.transform.position;
             rac.transform.SetParent(gameObject.transform);
@@ -2440,52 +2117,40 @@ public void ContextSetUpSimObjPhysics()
 
         List<GameObject> recepboxes = new List<GameObject>();
 
-        foreach (Transform t in gameObject.transform)
-        {
+        foreach (Transform t in gameObject.transform) {
             // add any receptacle trigger boxes
-            if (t.GetComponent<Contains>())
-            {
-                if (!recepboxes.Contains(t.gameObject))
-                {
+            if (t.GetComponent<Contains>()) {
+                if (!recepboxes.Contains(t.gameObject)) {
                     recepboxes.Add(t.gameObject);
                 }
             }
 
-            if (t.name == "Colliders")
-            {
-                if (!gameObject.transform.Find("TriggerColliders"))
-                {
+            if (t.name == "Colliders") {
+                if (!gameObject.transform.Find("TriggerColliders")) {
                     GameObject inst = Instantiate(t.gameObject, gameObject.transform, true);
                     inst.name = "TriggerColliders";
-                    foreach (Transform yes in inst.transform)
-                    {
+                    foreach (Transform yes in inst.transform) {
                         yes.GetComponent<Collider>().isTrigger = true;
                     }
-                }
-                else
-                {
+                } else {
                     DestroyImmediate(gameObject.transform.Find("TriggerColliders").gameObject);
                     GameObject inst = Instantiate(t.gameObject, gameObject.transform, true);
                     inst.name = "TriggerColliders";
-                    foreach (Transform yes in inst.transform)
-                    {
+                    foreach (Transform yes in inst.transform) {
                         yes.GetComponent<Collider>().isTrigger = true;
                     }
                 }
             }
 
             // check if child object "t" has any objects under it called "Colliders"
-            if (t.Find("Colliders"))
-            {
+            if (t.Find("Colliders")) {
                 Transform childColliderObject = t.Find("Colliders");
 
                 // if TriggerColliders dont already exist as a child under this child object t, create it by copying childColliderObject
-                if (!t.Find("TriggerColliders"))
-                {
+                if (!t.Find("TriggerColliders")) {
                     GameObject inst = Instantiate(childColliderObject.gameObject, t, true);
                     inst.name = "TriggerColliders";
-                    foreach (Transform thing in inst.transform)
-                    {
+                    foreach (Transform thing in inst.transform) {
                         thing.GetComponent<Collider>().isTrigger = true;
                     }
                 }
@@ -2502,16 +2167,13 @@ public void ContextSetUpSimObjPhysics()
     }
 
     //[ContextMenu("Set Up Colliders")]
-    public void ContextSetUpColliders()
-    {
+    public void ContextSetUpColliders() {
         List<Collider> listColliders = new List<Collider>();
 
-        if (transform.Find("Colliders"))
-        {
+        if (transform.Find("Colliders")) {
             Transform Colliders = transform.Find("Colliders");
 
-            foreach (Transform child in Colliders)
-            {
+            foreach (Transform child in Colliders) {
                 // list.toarray
                 listColliders.Add(child.GetComponent<Collider>());
 
@@ -2520,8 +2182,7 @@ public void ContextSetUpColliders()
                 child.gameObject.tag = "SimObjPhysics";
                 child.gameObject.layer = 8;
 
-                if (child.GetComponent<Collider>())
-                {
+                if (child.GetComponent<Collider>()) {
                     child.GetComponent<Collider>().enabled = true;
                     child.GetComponent<Collider>().isTrigger = false;
                 }
@@ -2529,14 +2190,11 @@ public void ContextSetUpColliders()
         }
 
         // loop through all child objects. For each object, check if the child itself has a child called Colliders....
-        foreach (Transform child in transform)
-        {
-            if (child.Find("Colliders") && !child.GetComponent<SimObjPhysics>())
-            {
+        foreach (Transform child in transform) {
+            if (child.Find("Colliders") && !child.GetComponent<SimObjPhysics>()) {
                 Transform Colliders = child.Find("Colliders");
 
-                foreach (Transform childschild in Colliders)
-                {
+                foreach (Transform childschild in Colliders) {
                     // list.toarray
                     listColliders.Add(childschild.GetComponent<Collider>());
 
@@ -2545,8 +2203,7 @@ public void ContextSetUpColliders()
                     childschild.gameObject.tag = "SimObjPhysics";
                     childschild.gameObject.layer = 8;
 
-                    if (childschild.GetComponent<Collider>())
-                    {
+                    if (childschild.GetComponent<Collider>()) {
                         childschild.GetComponent<Collider>().enabled = true;
                         childschild.GetComponent<Collider>().isTrigger = false;
                     }
@@ -2558,16 +2215,13 @@ public void ContextSetUpColliders()
     }
 
     //[ContextMenu("Set Up TriggerColliders")]
-    void ContextSetUpTriggerColliders()
-    {
-        if (transform.Find("TriggerColliders"))
-        {
+    void ContextSetUpTriggerColliders() {
+        if (transform.Find("TriggerColliders")) {
             Transform tc = transform.Find("TriggerColliders");
 
             List<GameObject> listtc = new List<GameObject>();
 
-            foreach (Transform child in tc)
-            {
+            foreach (Transform child in tc) {
                 // list.toarray
                 listtc.Add(child.gameObject);
 
@@ -2576,8 +2230,7 @@ void ContextSetUpTriggerColliders()
                 child.gameObject.tag = "SimObjPhysics";
                 child.gameObject.layer = 8;
 
-                if (child.GetComponent<Collider>())
-                {
+                if (child.GetComponent<Collider>()) {
                     child.GetComponent<Collider>().enabled = true;
                     child.GetComponent<Collider>().isTrigger = true;
                 }
@@ -2588,16 +2241,13 @@ void ContextSetUpTriggerColliders()
     }
 
     // [ContextMenu("Set Up VisibilityPoints")]
-    public void ContextSetUpVisibilityPoints()
-    {
+    public void ContextSetUpVisibilityPoints() {
         List<Transform> vplist = new List<Transform>();
 
-        if (transform.Find("VisibilityPoints"))
-        {
+        if (transform.Find("VisibilityPoints")) {
             Transform vp = transform.Find("VisibilityPoints");
 
-            foreach (Transform child in vp)
-            {
+            foreach (Transform child in vp) {
                 vplist.Add(child);
 
                 // set correct tag and layer for each object
@@ -2606,14 +2256,11 @@ public void ContextSetUpVisibilityPoints()
             }
         }
 
-        foreach (Transform child in transform)
-        {
-            if (child.Find("VisibilityPoints") && !child.GetComponent<SimObjPhysics>())
-            {
+        foreach (Transform child in transform) {
+            if (child.Find("VisibilityPoints") && !child.GetComponent<SimObjPhysics>()) {
                 Transform vp = child.Find("VisibilityPoints");
 
-                foreach (Transform childschild in vp)
-                {
+                foreach (Transform childschild in vp) {
                     vplist.Add(childschild);
                     childschild.gameObject.tag = "Untagged";
                     childschild.gameObject.layer = 8;
@@ -2626,15 +2273,13 @@ public void ContextSetUpVisibilityPoints()
 #endif
 
     //[ContextMenu("Set Up Bounding Box")]
-    public void ContextSetUpBoundingBox(bool forceCacheReset = false)
-    {
+    public void ContextSetUpBoundingBox(bool forceCacheReset = false) {
         Vector3[] transformSaver = new Vector3[] { transform.position, transform.eulerAngles };
 
         transform.position = Vector3.zero;
         transform.eulerAngles = Vector3.zero;
 
-        if (BoundingBox == null)
-        {
+        if (BoundingBox == null) {
             GameObject BoundingBox = new GameObject("BoundingBox");
             BoundingBox.transform.parent = gameObject.transform;
             BoundingBox.transform.localPosition = Vector3.zero;
@@ -2651,8 +2296,7 @@ public void ContextSetUpBoundingBox(bool forceCacheReset = false)
         BoundingBox.tag = "Untagged";
         BoundingBox.layer = 9; // layer 9 - SimObjInvisible
 
-        if (!Physics.autoSyncTransforms)
-        {
+        if (!Physics.autoSyncTransforms) {
             Physics.SyncTransforms();
         }
 
@@ -2667,8 +2311,7 @@ public void ContextSetUpBoundingBox(bool forceCacheReset = false)
         // Transform rootBoneSurrogateParent = new GameObject().transform;
 
         // Reset existing Bounding Box
-        if (BoundingBox.GetComponent<BoxCollider>())
-        {
+        if (BoundingBox.GetComponent<BoxCollider>()) {
             BoundingBox.GetComponent<BoxCollider>().enabled = true;
             BoundingBox.GetComponent<BoxCollider>().center = colliders[0].bounds.center;
             BoundingBox.GetComponent<BoxCollider>().size = Vector3.zero;
@@ -2679,42 +2322,34 @@ public void ContextSetUpBoundingBox(bool forceCacheReset = false)
         Vector3 maxMeshXYZ = colliders[0].bounds.center;
 
         // Encapsulate all colliders
-        foreach (Collider collider in colliders)
-        {
+        foreach (Collider collider in colliders) {
             newBoundingBox.Encapsulate(collider.gameObject.GetComponent<Collider>().bounds);
         }
 
         // Encapsulate all mesh filters (used instead of mesh renderers because you can sample individual vertex ids with the filters)
         // Excluded min-y because my material ID triangles are all located way below their respective main-meshes
         // newBoundingBox.Encapsulate(meshGroup.GetComponent<meshFilter>().mesh.bounds.min);
-        foreach (MeshFilter meshFilter in meshes)
-        {
+        foreach (MeshFilter meshFilter in meshes) {
             // if (meshFilter.gameObject.name != "screen_1" && meshFilter.gameObject.name != "screen_2")
             //{
-            foreach (Vector3 vertex in meshFilter.sharedMesh.vertices)
-            {
-                if (minMeshXZ.x > meshFilter.gameObject.transform.TransformPoint(vertex).x)
-                {
+            foreach (Vector3 vertex in meshFilter.sharedMesh.vertices) {
+                if (minMeshXZ.x > meshFilter.gameObject.transform.TransformPoint(vertex).x) {
                     minMeshXZ.x = meshFilter.gameObject.transform.TransformPoint(vertex).x;
                 }
 
-                if (minMeshXZ.z > meshFilter.gameObject.transform.TransformPoint(vertex).z)
-                {
+                if (minMeshXZ.z > meshFilter.gameObject.transform.TransformPoint(vertex).z) {
                     minMeshXZ.z = meshFilter.gameObject.transform.TransformPoint(vertex).z;
                 }
 
-                if (maxMeshXYZ.x < meshFilter.gameObject.transform.TransformPoint(vertex).x)
-                {
+                if (maxMeshXYZ.x < meshFilter.gameObject.transform.TransformPoint(vertex).x) {
                     maxMeshXYZ.x = meshFilter.gameObject.transform.TransformPoint(vertex).x;
                 }
 
-                if (maxMeshXYZ.y < meshFilter.gameObject.transform.TransformPoint(vertex).y)
-                {
+                if (maxMeshXYZ.y < meshFilter.gameObject.transform.TransformPoint(vertex).y) {
                     maxMeshXYZ.y = meshFilter.gameObject.transform.TransformPoint(vertex).y;
                 }
 
-                if (maxMeshXYZ.z < meshFilter.gameObject.transform.TransformPoint(vertex).z)
-                {
+                if (maxMeshXYZ.z < meshFilter.gameObject.transform.TransformPoint(vertex).z) {
                     maxMeshXYZ.z = meshFilter.gameObject.transform.TransformPoint(vertex).z;
                 }
 
@@ -2763,8 +2398,7 @@ public void ContextSetUpBoundingBox(bool forceCacheReset = false)
         transform.position = transformSaver[0];
         transform.eulerAngles = transformSaver[1];
 
-        if (forceCacheReset)
-        {
+        if (forceCacheReset) {
             this.syncBoundingBoxes(forceCacheReset: true);
         }
     }
@@ -2774,8 +2408,7 @@ public static ObjectMetadata ObjectMetadataFromSimObjPhysics(
         SimObjPhysics simObj,
         bool isVisible,
         bool isInteractable
-    )
-    {
+    ) {
         ObjectMetadata objMeta = new ObjectMetadata();
         GameObject o = simObj.gameObject;
         objMeta.name = o.name;
@@ -2785,8 +2418,7 @@ bool isInteractable
         objMeta.receptacle = simObj.IsReceptacle;
 
         objMeta.openable = simObj.IsOpenable;
-        if (objMeta.openable)
-        {
+        if (objMeta.openable) {
             objMeta.isOpen = simObj.IsOpen;
             objMeta.openness = simObj.openness;
         }
@@ -2795,33 +2427,28 @@ bool isInteractable
         //note: not all objects that report back `isToggled` are themselves `toggleable`, however they all do have the `CanToggleOnOff` secondary sim object property
         //this is to account for cases like a [stove burner], which can report `isToggled` but cannot have the "ToggleObjectOn" action performed on them directly, and instead
         //a [stove knob] linked to the [stove burner] must have a "ToggleObjectOn" action performed on it to have both the knob and burner set to a state of `isToggled = true`
-        if (simObj.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanToggleOnOff))
-        {
+        if (simObj.DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanToggleOnOff)) {
             objMeta.isToggled = simObj.IsToggled;
         }
 
         objMeta.breakable = simObj.IsBreakable;
-        if (objMeta.breakable)
-        {
+        if (objMeta.breakable) {
             objMeta.isBroken = simObj.IsBroken;
         }
 
         objMeta.canFillWithLiquid = simObj.IsFillable;
-        if (objMeta.canFillWithLiquid)
-        {
+        if (objMeta.canFillWithLiquid) {
             objMeta.isFilledWithLiquid = simObj.IsFilled;
             objMeta.fillLiquid = simObj.FillLiquid;
         }
 
         objMeta.dirtyable = simObj.IsDirtyable;
-        if (objMeta.dirtyable)
-        {
+        if (objMeta.dirtyable) {
             objMeta.isDirty = simObj.IsDirty;
         }
 
         objMeta.cookable = simObj.IsCookable;
-        if (objMeta.cookable)
-        {
+        if (objMeta.cookable) {
             objMeta.isCooked = simObj.IsCooked;
         }
 
@@ -2830,14 +2457,12 @@ bool isInteractable
             simObj.IsPickupable
             || simObj.IsMoveable
             || (simObj.salientMaterials != null && simObj.salientMaterials.Length > 0)
-        )
-        {
+        ) {
             // this object should report back mass and salient materials
 
             string[] salientMaterialsToString = new string[simObj.salientMaterials.Length];
 
-            for (int i = 0; i < simObj.salientMaterials.Length; i++)
-            {
+            for (int i = 0; i < simObj.salientMaterials.Length; i++) {
                 salientMaterialsToString[i] = simObj.salientMaterials[i].ToString();
             }
 
@@ -2860,14 +2485,12 @@ bool isInteractable
         // }
 
         objMeta.sliceable = simObj.IsSliceable;
-        if (objMeta.sliceable)
-        {
+        if (objMeta.sliceable) {
             objMeta.isSliced = simObj.IsSliced;
         }
 
         objMeta.canBeUsedUp = simObj.CanBeUsedUp;
-        if (objMeta.canBeUsedUp)
-        {
+        if (objMeta.canBeUsedUp) {
             objMeta.isUsedUp = simObj.IsUsedUp;
         }
 
@@ -2900,8 +2523,7 @@ bool isInteractable
         return objMeta;
     }
 
-    class BoundingBoxCacheKey
-    {
+    class BoundingBoxCacheKey {
         public Vector3 position;
         public Quaternion rotation;
         public bool IsOpen;
diff --git a/unity/Assets/Scripts/SimObjType.cs b/unity/Assets/Scripts/SimObjType.cs
index 7307b426d6..339fb07c27 100644
--- a/unity/Assets/Scripts/SimObjType.cs
+++ b/unity/Assets/Scripts/SimObjType.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 
 [Serializable]
-public enum SimObjManipType : int
-{ // We aren't using these manip types for the Physics Implementation, they are being replaced with the SimObjPrimaryProperty below
+public enum SimObjManipType : int { // We aren't using these manip types for the Physics Implementation, they are being replaced with the SimObjPrimaryProperty below
     Inventory = 0,
     Static = 1,
     Rearrangeable = 2,
@@ -104,8 +103,7 @@ public enum SimObjSecondaryProperty : int // EACH SimObjPhysics can have any num
 }
 
 [Serializable]
-public enum SimObjType : int
-{
+public enum SimObjType : int {
     // undefined is always the first value
     Undefined = 0,
 
@@ -282,8 +280,7 @@ public enum SimObjType : int
     Objaverse = 167
 }
 
-public static class ReceptacleRestrictions
-{
+public static class ReceptacleRestrictions {
     // these objects generate ObjectIDs based on their parent object to show that they are related. ie: "Bathtub|1|1|1|" has a child sim object BathtubBasin with the ID "Bathtub|1|1|1|BathtubBasin"
     // this is specifically used for objects that have distinct zones that should be individually interactable (outer part vs inner part) but share the same geometry, like a bathtub.
     // Objets like a Coffeetable with inset Drawers should NOT be on this list because those objects do not share geometry (table vs drawer)
diff --git a/unity/Assets/Scripts/SimTesting.cs b/unity/Assets/Scripts/SimTesting.cs
index b9180d1062..2f3f109eb2 100644
--- a/unity/Assets/Scripts/SimTesting.cs
+++ b/unity/Assets/Scripts/SimTesting.cs
@@ -4,10 +4,8 @@
 using UnityEngine;
 
 // class for testing SimUtil functions
-public class SimTesting : MonoBehaviour
-{
-    public enum TestMethod
-    {
+public class SimTesting : MonoBehaviour {
+    public enum TestMethod {
         SpherecastAll,
         CheckVisibility,
         Raycast,
@@ -32,29 +30,22 @@ public enum TestMethod
     public bool foundPlacementPoint;
     public SimObj inventoryObject;
 
-    void Start()
-    {
-        if (inventoryObject != null)
-        {
+    void Start() {
+        if (inventoryObject != null) {
             inventoryObject.gameObject.SetActive(false);
         }
     }
 
 #if UNITY_EDITOR
     // used to show what's currently visible
-    void OnGUI()
-    {
-        if (SimObjsInView != null)
-        {
-            if (SimObjsInView.Length > 10)
-            {
+    void OnGUI() {
+        if (SimObjsInView != null) {
+            if (SimObjsInView.Length > 10) {
                 int horzIndex = -1;
                 GUILayout.BeginHorizontal();
-                foreach (SimObj o in SimObjsInView)
-                {
+                foreach (SimObj o in SimObjsInView) {
                     horzIndex++;
-                    if (horzIndex >= 3)
-                    {
+                    if (horzIndex >= 3) {
                         GUILayout.EndHorizontal();
                         GUILayout.BeginHorizontal();
                         horzIndex = 0;
@@ -66,11 +57,8 @@ void OnGUI()
                     );
                 }
                 GUILayout.EndHorizontal();
-            }
-            else
-            {
-                foreach (SimObj o in SimObjsInView)
-                {
+            } else {
+                foreach (SimObj o in SimObjsInView) {
                     GUILayout.Button(
                         o.ObjectID,
                         UnityEditor.EditorStyles.miniButton,
@@ -83,19 +71,16 @@ void OnGUI()
 #endif
 
 #if UNITY_EDITOR
-    void OnDisable()
-    {
+    void OnDisable() {
         // make all sim objs invisible
         SimObj[] simObjs = GameObject.FindObjectsOfType<SimObj>();
-        foreach (SimObj o in simObjs)
-        {
+        foreach (SimObj o in simObjs) {
             o.VisibleNow = false;
         }
     }
 #endif
 
-    void Update()
-    {
+    void Update() {
         // check for a navmesh hit
         foundPlacementPoint = PlacementManager.GetPlacementPoint(
             transform.position,
@@ -106,20 +91,15 @@ void Update()
             ref placementPoint
         );
 
-        if (inventoryObject != null && Input.GetKeyDown(KeyCode.P))
-        {
-            if (inventoryObject.gameObject.activeSelf)
-            {
+        if (inventoryObject != null && Input.GetKeyDown(KeyCode.P)) {
+            if (inventoryObject.gameObject.activeSelf) {
                 SimUtil.TakeItem(inventoryObject);
-            }
-            else if (foundPlacementPoint)
-            {
+            } else if (foundPlacementPoint) {
                 PlacementManager.PlaceObjectAtPoint(inventoryObject, placementPoint);
             }
         }
 
-        switch (Method)
-        {
+        switch (Method) {
             case TestMethod.CheckVisibility:
             default:
                 SimObjsInView = SimUtil.GetAllVisibleSimObjs(Cam, MaxDistance);
@@ -129,14 +109,12 @@ ref placementPoint
         }
 
         // resize the array to avoid confusion in the test
-        if (SimObjsInView.Length != NumItems)
-        {
+        if (SimObjsInView.Length != NumItems) {
             Array.Resize<SimObj>(ref SimObjsInView, NumItems);
         }
     }
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.cyan;
         Gizmos.DrawSphere(Cam.transform.position, 0.1f);
         Gizmos.color = Color.grey;
@@ -152,8 +130,7 @@ void OnDrawGizmos()
 
         Gizmos.color = foundPlacementPoint ? Color.green : Color.gray;
         Gizmos.DrawSphere(transform.position + (Cam.transform.forward * ReachDistance), 0.05f);
-        if (foundPlacementPoint)
-        {
+        if (foundPlacementPoint) {
             Gizmos.DrawLine(
                 transform.position + (Cam.transform.forward * ReachDistance),
                 placementPoint
diff --git a/unity/Assets/Scripts/SimUtil.cs b/unity/Assets/Scripts/SimUtil.cs
index 0d21435a06..f0d4d3bdb5 100644
--- a/unity/Assets/Scripts/SimUtil.cs
+++ b/unity/Assets/Scripts/SimUtil.cs
@@ -7,8 +7,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-public static class SimUtil
-{
+public static class SimUtil {
     // how fast smooth-animated s / cabinets / etc animate
     public const float SmoothAnimationSpeed = 0.5f;
 
@@ -37,18 +36,13 @@ public static class SimUtil
 
     #region SimObj utility functions
 
-    public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistance)
-    {
+    public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistance) {
 #if UNITY_EDITOR
-        if (ShowObjectVisibility)
-        {
+        if (ShowObjectVisibility) {
             // set all objects to invisible before starting - THIS IS EXPENSIVE
-            if (SceneManager.Current != null)
-            {
-                foreach (SimObj obj in SceneManager.Current.ObjectsInScene)
-                {
-                    if (obj != null)
-                    {
+            if (SceneManager.Current != null) {
+                foreach (SimObj obj in SceneManager.Current.ObjectsInScene) {
+                    if (obj != null) {
                         obj.VisibleNow = false;
                     }
                 }
@@ -72,16 +66,13 @@ public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistanc
             QueryTriggerInteraction.Collide
         );
         // go through them one by one and determine if they're actually simObjs
-        for (int i = 0; i < colliders.Length; i++)
-        {
+        for (int i = 0; i < colliders.Length; i++) {
             if (
                 colliders[i].CompareTag(SimUtil.SimObjTag)
                 || colliders[i].CompareTag(SimUtil.ReceptacleTag)
-            )
-            {
+            ) {
                 SimObj o = null;
-                if (GetSimObjFromCollider(colliders[i], out o))
-                {
+                if (GetSimObjFromCollider(colliders[i], out o)) {
                     // this may result in duplicates because of 'open' receptacles
                     // but using a hashset cancels that out
                     // don't worry about items contained in receptacles until visibility
@@ -91,10 +82,8 @@ public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistanc
         }
         // now check to see if they're actually visible
         RaycastHit hit = new RaycastHit();
-        foreach (SimObj item in uniqueItems)
-        {
-            if (!CheckItemBounds(item, agentCameraPos))
-            {
+        foreach (SimObj item in uniqueItems) {
+            if (!CheckItemBounds(item, agentCameraPos)) {
                 // if the camera isn't in bounds, skip this item
                 continue;
             }
@@ -103,10 +92,8 @@ public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistanc
 
             // if it's a receptacle
             // raycast against every pivot in the receptacle just to make sure we don't miss anything
-            if (item.IsReceptacle)
-            {
-                foreach (Transform pivot in item.Receptacle.Pivots)
-                {
+            if (item.IsReceptacle) {
+                foreach (Transform pivot in item.Receptacle.Pivots) {
                     canSeeItem = CheckPointVisibility(
                         item,
                         pivot.position,
@@ -118,17 +105,14 @@ public static SimObj[] GetAllVisibleSimObjs(Camera agentCamera, float maxDistanc
                         out hit
                     );
                     // if we can see it no need for more checks!
-                    if (canSeeItem)
-                    {
+                    if (canSeeItem) {
                         break;
                     }
                 }
             }
 
-            if (!canSeeItem)
-            {
-                for (int i = 0; i < VisibilityCheckSteps; i++)
-                {
+            if (!canSeeItem) {
+                for (int i = 0; i < VisibilityCheckSteps; i++) {
                     canSeeItem = CheckPointVisibility(
                         item,
                         Vector3.Lerp(
@@ -145,23 +129,20 @@ out hit
                     );
 
                     // if we can see it no need for more checks!
-                    if (canSeeItem)
-                    {
+                    if (canSeeItem) {
                         break;
                     }
                 }
             }
 
-            if (canSeeItem)
-            {
+            if (canSeeItem) {
                 // if it's the same object, add it to the list
 #if UNITY_EDITOR
                 item.VisibleNow = ShowObjectVisibility & true;
 #endif
                 items.Add(item);
                 // now check to see if it's a receptacle interior
-                if (item.IsReceptacle && hit.collider.CompareTag(SimUtil.ReceptacleTag))
-                {
+                if (item.IsReceptacle && hit.collider.CompareTag(SimUtil.ReceptacleTag)) {
                     // if it is, add the items in the receptacle as well
                     items.AddRange(
                         GetVisibleItemsFromReceptacle(
@@ -186,8 +167,7 @@ out hit
     }
 
     // checks whether a point is in view of the camera
-    public static bool CheckPointVisibility(Vector3 itemTargetPoint, Camera agentCamera)
-    {
+    public static bool CheckPointVisibility(Vector3 itemTargetPoint, Camera agentCamera) {
         Vector3 viewPoint = agentCamera.WorldToViewportPoint(itemTargetPoint);
         if (
             viewPoint.z > 0 // in front of camera
@@ -195,8 +175,7 @@ public static bool CheckPointVisibility(Vector3 itemTargetPoint, Camera agentCam
             && viewPoint.x > ViewPointRangeLow // within x bounds
             && viewPoint.y < ViewPointRangeHigh
             && viewPoint.y > ViewPointRangeLow
-        )
-        { // within y bounds
+        ) { // within y bounds
             return true;
         }
         return false;
@@ -213,8 +192,7 @@ static bool CheckPointVisibility(
         bool checkTrigger,
         float maxDistance,
         out RaycastHit hit
-    )
-    {
+    ) {
         hit = new RaycastHit();
         Vector3 viewPoint = agentCamera.WorldToViewportPoint(itemTargetPoint);
 
@@ -224,8 +202,7 @@ out RaycastHit hit
             && viewPoint.x > ViewPointRangeLow // within x bounds
             && viewPoint.y < ViewPointRangeHigh
             && viewPoint.y > ViewPointRangeLow
-        )
-        { // within y bounds
+        ) { // within y bounds
             Vector3 itemDirection = Vector3.zero;
             // do a raycast in the direction of the item
             itemDirection = (itemTargetPoint - agentCameraPos).normalized;
@@ -259,14 +236,12 @@ out RaycastHit hit
                             : QueryTriggerInteraction.Ignore
                     )
                 )
-            )
-            {
+            ) {
                 // check to see if we hit the item we're after
                 if (
                     hit.collider.attachedRigidbody != null
                     && hit.collider.attachedRigidbody.gameObject == item.gameObject
-                )
-                {
+                ) {
 #if UNITY_EDITOR
                     Debug.DrawLine(
                         agentCameraPos,
@@ -289,29 +264,23 @@ out RaycastHit hit
     // if successful, object is placed into the world and activated
     // this only works on objects of SimObjManipulation type 'inventory'
     // if an object was spawned in a Receptacle, this function will also return false
-    public static bool PutItemBackInStartupPosition(SimObj item)
-    {
-        if (item == null)
-        {
+    public static bool PutItemBackInStartupPosition(SimObj item) {
+        if (item == null) {
             Debug.LogError("Item is null, not putting item back");
             return false;
         }
 
         bool result = false;
 
-        switch (item.Manipulation)
-        {
+        switch (item.Manipulation) {
             case SimObjManipType.Inventory:
-                if (item.StartupTransform != null)
-                {
+                if (item.StartupTransform != null) {
                     item.transform.position = item.StartupTransform.position;
                     item.transform.rotation = item.StartupTransform.rotation;
                     item.transform.localScale = item.StartupTransform.localScale;
                     item.gameObject.SetActive(true);
                     result = true;
-                }
-                else
-                {
+                } else {
                     Debug.LogWarning(
                         "Item had no startup transform. This probably means it was spawned in a receptacle."
                     );
@@ -327,8 +296,7 @@ public static bool PutItemBackInStartupPosition(SimObj item)
     // TAKES an item
     // removes it from any receptacles, then disables it entirely
     // this works whether the item is standalone or in a receptacle
-    public static void TakeItem(SimObj item)
-    {
+    public static void TakeItem(SimObj item) {
         // make item visible to raycasts
         // unparent in case it's in a receptacle
         item.VisibleToRaycasts = true;
@@ -342,11 +310,9 @@ public static void TakeItem(SimObj item)
     }
 
     // checks whether the item
-    public static bool CheckItemBounds(SimObj item, Vector3 agentPosition)
-    {
+    public static bool CheckItemBounds(SimObj item, Vector3 agentPosition) {
         // if the item doesn't use custom bounds this is an automatic pass
-        if (!item.UseCustomBounds)
-        {
+        if (!item.UseCustomBounds) {
             return true;
         }
 
@@ -362,29 +328,23 @@ public static bool CheckItemBounds(SimObj item, Vector3 agentPosition)
 
     // searches for a SimObj item under a receptacle by ID
     // this does not TAKE the item, it just searches for it
-    public static bool FindItemFromReceptacleByID(string itemID, Receptacle r, out SimObj item)
-    {
+    public static bool FindItemFromReceptacleByID(string itemID, Receptacle r, out SimObj item) {
         item = null;
         // make sure we're not doing something insane
-        if (r == null)
-        {
+        if (r == null) {
             Debug.LogError("Receptacle was null, not searching for item");
             return false;
         }
 
-        if (!IsObjectIDValid(itemID))
-        {
+        if (!IsObjectIDValid(itemID)) {
             Debug.LogError("itemID " + itemID.ToString() + " is NOT valid, not searching for item");
             return false;
         }
         SimObj checkItem = null;
-        for (int i = 0; i < r.Pivots.Length; i++)
-        {
-            if (r.Pivots[i].childCount > 0)
-            {
+        for (int i = 0; i < r.Pivots.Length; i++) {
+            if (r.Pivots[i].childCount > 0) {
                 checkItem = r.Pivots[i].GetChild(0).GetComponent<SimObj>();
-                if (checkItem != null && checkItem.ObjectID == itemID)
-                {
+                if (checkItem != null && checkItem.ObjectID == itemID) {
                     // if the item under the pivot is a SimObj with the right id
                     // we've found what we're after
                     item = checkItem;
@@ -402,28 +362,22 @@ public static bool FindItemFromReceptacleByType(
         SimObjType itemType,
         Receptacle r,
         out SimObj item
-    )
-    {
+    ) {
         item = null;
         // make sure we're not doing something insane
-        if (r == null)
-        {
+        if (r == null) {
             Debug.LogError("Receptacle was null, not searching for item");
             return false;
         }
-        if (itemType == SimObjType.Undefined)
-        {
+        if (itemType == SimObjType.Undefined) {
             Debug.LogError("Can't search for type UNDEFINED, not searching for item");
             return false;
         }
         SimObj checkItem = null;
-        for (int i = 0; i < r.Pivots.Length; i++)
-        {
-            if (r.Pivots[i].childCount > 0)
-            {
+        for (int i = 0; i < r.Pivots.Length; i++) {
+            if (r.Pivots[i].childCount > 0) {
                 checkItem = r.Pivots[i].GetChild(0).GetComponent<SimObj>();
-                if (checkItem != null && checkItem.Type == itemType)
-                {
+                if (checkItem != null && checkItem.Type == itemType) {
                     // if the item under the pivot is a SimObj of the right type
                     // we've found what we're after
                     item = checkItem;
@@ -438,28 +392,23 @@ out SimObj item
     // adds the item to a receptacle
     // enabled the object, parents it under an empty pivot, then makes it invisible to raycasts
     // returns false if there are no available pivots in the receptacle
-    public static bool AddItemToVisibleReceptacle(SimObj item, Receptacle r, Camera camera)
-    {
+    public static bool AddItemToVisibleReceptacle(SimObj item, Receptacle r, Camera camera) {
         // make sure we're not doing something insane
-        if (item == null)
-        {
+        if (item == null) {
             Debug.LogError("Can't add null item to receptacle");
             return false;
         }
-        if (r == null)
-        {
+        if (r == null) {
             Debug.LogError("Receptacle was null, not adding item");
             return false;
         }
-        if (item.gameObject == r.gameObject)
-        {
+        if (item.gameObject == r.gameObject) {
             Debug.LogError("Receptacle and item were same object, can't add item to itself");
             return false;
         }
         // make sure there's room in the recepticle
         Transform emptyPivot = null;
-        if (!GetFirstEmptyVisibleReceptaclePivot(r, camera, out emptyPivot))
-        {
+        if (!GetFirstEmptyVisibleReceptaclePivot(r, camera, out emptyPivot)) {
             Debug.Log("No visible Pivots found");
             return false;
         }
@@ -469,28 +418,23 @@ public static bool AddItemToVisibleReceptacle(SimObj item, Receptacle r, Camera
     // adds the item to a receptacle
     // enabled the object, parents it under an empty pivot, then makes it invisible to raycasts
     // returns false if there are no available pivots in the receptacle
-    public static bool AddItemToReceptacle(SimObj item, Receptacle r)
-    {
+    public static bool AddItemToReceptacle(SimObj item, Receptacle r) {
         // make sure we're not doing something insane
-        if (item == null)
-        {
+        if (item == null) {
             Debug.LogError("Can't add null item to receptacle");
             return false;
         }
-        if (r == null)
-        {
+        if (r == null) {
             Debug.LogError("Receptacle was null, not adding item");
             return false;
         }
-        if (item.gameObject == r.gameObject)
-        {
+        if (item.gameObject == r.gameObject) {
             Debug.LogError("Receptacle and item were same object, can't add item to itself");
             return false;
         }
         // make sure there's room in the recepticle
         Transform emptyPivot = null;
-        if (!GetFirstEmptyReceptaclePivot(r, out emptyPivot))
-        {
+        if (!GetFirstEmptyReceptaclePivot(r, out emptyPivot)) {
             // Debug.Log ("Receptacle is full");
             return false;
         }
@@ -500,16 +444,13 @@ public static bool AddItemToReceptacle(SimObj item, Receptacle r)
     // adds the item to a receptacle
     // enabled the object, parents it under an empty pivot, then makes it invisible to raycasts
     // returns false if there are no available pivots in the receptacle
-    public static bool AddItemToReceptaclePivot(SimObj item, Transform pivot)
-    {
-        if (item == null)
-        {
+    public static bool AddItemToReceptaclePivot(SimObj item, Transform pivot) {
+        if (item == null) {
             Debug.LogError("SimObj item was null in AddItemToReceptaclePivot, not adding");
             return false;
         }
 
-        if (pivot == null)
-        {
+        if (pivot == null) {
             Debug.LogError(
                 "Pivot was null when attempting to add item "
                     + item.name
@@ -535,13 +476,10 @@ public static bool AddItemToReceptaclePivot(SimObj item, Transform pivot)
         return true;
     }
 
-    public static bool GetFirstEmptyReceptaclePivot(Receptacle r, out Transform emptyPivot)
-    {
+    public static bool GetFirstEmptyReceptaclePivot(Receptacle r, out Transform emptyPivot) {
         emptyPivot = null;
-        for (int i = 0; i < r.Pivots.Length; i++)
-        {
-            if (r.Pivots[i].childCount == 0)
-            {
+        for (int i = 0; i < r.Pivots.Length; i++) {
+            if (r.Pivots[i].childCount == 0) {
                 emptyPivot = r.Pivots[i];
                 break;
             }
@@ -553,18 +491,15 @@ public static bool GetFirstEmptyVisibleReceptaclePivot(
         Receptacle r,
         Camera camera,
         out Transform emptyPivot
-    )
-    {
+    ) {
         Plane[] planes = GeometryUtility.CalculateFrustumPlanes(camera);
 
         emptyPivot = null;
-        for (int i = 0; i < r.Pivots.Length; i++)
-        {
+        for (int i = 0; i < r.Pivots.Length; i++) {
             Transform t = r.Pivots[i];
             Bounds bounds = new Bounds(t.position, new Vector3(0.05f, 0.05f, 0.05f));
 
-            if (t.childCount == 0 && GeometryUtility.TestPlanesAABB(planes, bounds))
-            {
+            if (t.childCount == 0 && GeometryUtility.TestPlanesAABB(planes, bounds)) {
                 emptyPivot = r.Pivots[i];
                 break;
             }
@@ -573,11 +508,9 @@ out Transform emptyPivot
     }
 
     // tries to get a SimObj from a collider, returns false if none found
-    public static bool GetSimObjFromCollider(Collider c, out SimObj o)
-    {
+    public static bool GetSimObjFromCollider(Collider c, out SimObj o) {
         o = null;
-        if (c.attachedRigidbody == null)
-        {
+        if (c.attachedRigidbody == null) {
             // all sim objs must have a kinematic rigidbody
             return false;
         }
@@ -586,11 +519,9 @@ public static bool GetSimObjFromCollider(Collider c, out SimObj o)
     }
 
     // tries to get a receptacle from a collider, returns false if none found
-    public static bool GetReceptacleFromCollider(Collider c, out Receptacle r)
-    {
+    public static bool GetReceptacleFromCollider(Collider c, out Receptacle r) {
         r = null;
-        if (c.attachedRigidbody == null)
-        {
+        if (c.attachedRigidbody == null) {
             // all sim objs must have a kinematic rigidbody
             return false;
         }
@@ -600,13 +531,10 @@ public static bool GetReceptacleFromCollider(Collider c, out Receptacle r)
 
     // gets all SimObjs contained in a receptacle
     // this does not TAKE any of these items
-    public static SimObj[] GetItemsFromReceptacle(Receptacle r)
-    {
+    public static SimObj[] GetItemsFromReceptacle(Receptacle r) {
         List<SimObj> items = new List<SimObj>();
-        foreach (Transform t in r.Pivots)
-        {
-            if (t.childCount > 0)
-            {
+        foreach (Transform t in r.Pivots) {
+            if (t.childCount > 0) {
                 items.Add(t.GetChild(0).GetComponent<SimObj>());
             }
         }
@@ -620,24 +548,18 @@ public static SimObj[] GetVisibleItemsFromReceptacle(
         Camera agentCamera,
         Vector3 agentCameraPos,
         float maxDistance
-    )
-    {
+    ) {
         List<SimObj> items = new List<SimObj>();
         // RaycastHit hit = new RaycastHit();
-        foreach (Transform t in r.Pivots)
-        {
-            if (t.childCount > 0)
-            {
+        foreach (Transform t in r.Pivots) {
+            if (t.childCount > 0) {
                 SimObj item = t.GetChild(0).GetComponent<SimObj>();
                 // check whether the item is visible (center point only)
                 // since it's inside a receptacle, it will be on the invisible layer
-                if (CheckPointVisibility(item.CenterPoint, agentCamera))
-                {
+                if (CheckPointVisibility(item.CenterPoint, agentCamera)) {
                     item.VisibleNow = true;
                     items.Add(item);
-                }
-                else
-                {
+                } else {
                     item.VisibleNow = false;
                 }
             }
@@ -645,8 +567,7 @@ float maxDistance
         return items.ToArray();
     }
 
-    public static bool IsObjectIDValid(string objectID)
-    {
+    public static bool IsObjectIDValid(string objectID) {
         return !string.IsNullOrEmpty(objectID);
     }
 
@@ -656,12 +577,9 @@ public static bool IsObjectIDValid(string objectID)
 
 #if UNITY_EDITOR
     [UnityEditor.MenuItem("AI2-THOR/Set Up Base Objects")]
-    public static void SetUpBaseObjects()
-    {
-        foreach (GameObject go in UnityEditor.Selection.gameObjects)
-        {
-            if (go.transform.childCount > 0 && go.transform.GetChild(0).name == "Base")
-            {
+    public static void SetUpBaseObjects() {
+        foreach (GameObject go in UnityEditor.Selection.gameObjects) {
+            if (go.transform.childCount > 0 && go.transform.GetChild(0).name == "Base") {
                 continue;
             }
             GameObject newGo = new GameObject(go.name);
@@ -671,8 +589,7 @@ public static void SetUpBaseObjects()
             go.transform.parent = newGo.transform;
             go.name = "Base";
             BoxCollider bc = go.GetComponent<BoxCollider>();
-            if (bc == null)
-            {
+            if (bc == null) {
                 go.AddComponent<BoxCollider>();
             }
         }
@@ -684,8 +601,7 @@ public static void BuildScene(
         string outputPath,
         UnityEditor.BuildTarget buildTarget,
         bool launchOnBuild
-    )
-    {
+    ) {
         Debug.Log("Building scene '" + scenePath + "' to '" + outputPath + "'");
         // set up the player correctly
         UnityEditor.PlayerSettings.companyName = "Allen Institute for Artificial Intelligence";
@@ -713,10 +629,8 @@ bool launchOnBuild
     }
 
     [UnityEditor.MenuItem("AI2-THOR/RandomizeMaterials/Bin Materials")]
-    static void BinMaterials()
-    {
-        HashSet<Material> getMaterialsInScene()
-        {
+    static void BinMaterials() {
+        HashSet<Material> getMaterialsInScene() {
             HashSet<MeshRenderer> sceneMeshRenderers = new HashSet<MeshRenderer>();
             HashSet<Material> sceneMaterials = new HashSet<Material>();
 
@@ -729,8 +643,7 @@ HashSet<Material> getMaterialsInScene()
             );
 
             // Get all shared Materials from MeshRenderers
-            foreach (MeshRenderer meshRenderer in sceneMeshRenderers)
-            {
+            foreach (MeshRenderer meshRenderer in sceneMeshRenderers) {
                 sceneMaterials.UnionWith(meshRenderer.sharedMaterials);
             }
 
@@ -740,8 +653,7 @@ HashSet<Material> getMaterialsInScene()
         Dictionary<string, HashSet<Material>> materialMetadata = new Dictionary<
             string,
             HashSet<Material>
-        >()
-        {
+        >() {
             ["RawTrainMaterials"] = new HashSet<Material>(),
             ["RawValMaterials"] = new HashSet<Material>(),
             ["RawTestMaterials"] = new HashSet<Material>(),
@@ -753,17 +665,14 @@ HashSet<Material> getMaterialsInScene()
         };
 
         // iTHOR scenes
-        foreach (int sceneType in new int[] { 0, 200, 300, 400 })
-        {
-            for (int i = 1; i <= 30; i++)
-            {
+        foreach (int sceneType in new int[] { 0, 200, 300, 400 }) {
+            for (int i = 1; i <= 30; i++) {
                 string scenePath = $"Assets/Scenes/FloorPlan{sceneType + i}_physics.unity";
                 UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scenePath);
 
                 HashSet<Material> materials = getMaterialsInScene();
 
-                switch (sceneType)
-                {
+                switch (sceneType) {
                     case 0:
                         materialMetadata["RawKitchenMaterials"].UnionWith(materials);
                         break;
@@ -778,18 +687,13 @@ HashSet<Material> getMaterialsInScene()
                         break;
                 }
 
-                if (i <= 20)
-                {
+                if (i <= 20) {
                     // train scene
                     materialMetadata["RawTrainMaterials"].UnionWith(materials);
-                }
-                else if (i <= 25)
-                {
+                } else if (i <= 25) {
                     // val scene
                     materialMetadata["RawValMaterials"].UnionWith(materials);
-                }
-                else
-                {
+                } else {
                     // test scene
                     materialMetadata["RawTestMaterials"].UnionWith(materials);
                 }
@@ -797,10 +701,8 @@ HashSet<Material> getMaterialsInScene()
         }
 
         // RoboTHOR train
-        for (int i = 1; i <= 12; i++)
-        {
-            for (int j = 1; j <= 5; j++)
-            {
+        for (int i = 1; i <= 12; i++) {
+            for (int j = 1; j <= 5; j++) {
                 string scenePath = $"Assets/Scenes/FloorPlan_Train{i}_{j}.unity";
                 UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scenePath);
 
@@ -811,10 +713,8 @@ HashSet<Material> getMaterialsInScene()
         }
 
         // RoboTHOR val
-        for (int i = 1; i <= 3; i++)
-        {
-            for (int j = 1; j <= 5; j++)
-            {
+        for (int i = 1; i <= 3; i++) {
+            for (int j = 1; j <= 5; j++) {
                 string scenePath = $"Assets/Scenes/FloorPlan_Val{i}_{j}.unity";
                 UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scenePath);
 
@@ -829,11 +729,9 @@ HashSet<Material> getMaterialsInScene()
         GameObject physicsSceneManager = UnityEditor.PrefabUtility.LoadPrefabContents(prefabPath);
         ColorChanger colorChangeComponent = physicsSceneManager.GetComponent<ColorChanger>();
 
-        foreach (KeyValuePair<string, HashSet<Material>> keyValuePair in materialMetadata)
-        {
+        foreach (KeyValuePair<string, HashSet<Material>> keyValuePair in materialMetadata) {
             string label = keyValuePair.Key;
-            foreach (Material mat in keyValuePair.Value)
-            {
+            foreach (Material mat in keyValuePair.Value) {
                 HashSet<string> labels = new HashSet<string>(AssetDatabase.GetLabels(mat));
                 labels.Add(label);
                 AssetDatabase.SetLabels(mat, labels.ToArray());
@@ -848,11 +746,9 @@ HashSet<Material> getMaterialsInScene()
     }
 
     [UnityEditor.MenuItem("AI2-THOR/Replace Generic Prefabs in All Scenes")]
-    static void ReplacePrefabsInAllScenes()
-    {
+    static void ReplacePrefabsInAllScenes() {
         UnityEditor.SceneManagement.EditorSceneManager.SaveOpenScenes();
-        for (int i = 1; i <= 30; i++)
-        {
+        for (int i = 1; i <= 30; i++) {
             string scenePath = "Assets/Scenes/FloorPlan" + i.ToString() + ".unity";
             UnityEditor.EditorUtility.DisplayProgressBar(
                 "Replacing generics...",
@@ -860,12 +756,9 @@ static void ReplacePrefabsInAllScenes()
                 (1f / 30) * i
             );
             UnityEngine.SceneManagement.Scene openScene = new UnityEngine.SceneManagement.Scene();
-            try
-            {
+            try {
                 openScene = UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scenePath);
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.LogException(e);
                 continue;
             }
@@ -874,8 +767,7 @@ static void ReplacePrefabsInAllScenes()
             sm.ReplaceGenerics();
             // save the scene and close it
             UnityEditor.SceneManagement.EditorSceneManager.SaveScene(openScene);
-            if (UnityEditor.SceneManagement.EditorSceneManager.loadedSceneCount > 1)
-            {
+            if (UnityEditor.SceneManagement.EditorSceneManager.loadedSceneCount > 1) {
                 UnityEditor.SceneManagement.EditorSceneManager.CloseScene(openScene, true);
             }
         }
@@ -883,11 +775,9 @@ static void ReplacePrefabsInAllScenes()
     }
 
     [UnityEditor.MenuItem("AI2-THOR/Set SceneManager Scene Number")]
-    static void SetSceneManagerSceneNumber()
-    {
+    static void SetSceneManagerSceneNumber() {
         UnityEditor.SceneManagement.EditorSceneManager.SaveOpenScenes();
-        for (int i = 1; i <= 30; i++)
-        {
+        for (int i = 1; i <= 30; i++) {
             string scenePath = "Assets/Scenes/FloorPlan" + (i + 200).ToString() + ".unity";
             UnityEditor.EditorUtility.DisplayProgressBar(
                 "Setting scene numbers...",
@@ -895,12 +785,9 @@ static void SetSceneManagerSceneNumber()
                 (1f / 30) * i
             );
             UnityEngine.SceneManagement.Scene openScene = new UnityEngine.SceneManagement.Scene();
-            try
-            {
+            try {
                 openScene = UnityEditor.SceneManagement.EditorSceneManager.OpenScene(scenePath);
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.LogException(e);
                 continue;
             }
@@ -909,8 +796,7 @@ static void SetSceneManagerSceneNumber()
             sm.SceneNumber = i;
             // save the scene and close it
             UnityEditor.SceneManagement.EditorSceneManager.SaveScene(openScene);
-            if (UnityEditor.SceneManagement.EditorSceneManager.loadedSceneCount > 1)
-            {
+            if (UnityEditor.SceneManagement.EditorSceneManager.loadedSceneCount > 1) {
                 UnityEditor.SceneManagement.EditorSceneManager.CloseScene(openScene, true);
             }
         }
@@ -918,16 +804,12 @@ static void SetSceneManagerSceneNumber()
     }
 
     [UnityEditor.MenuItem("AI2-THOR/Set Pivot Scales to 1")]
-    static void SetPivotScalesToOne()
-    {
+    static void SetPivotScalesToOne() {
         Transform[] transforms = GameObject.FindObjectsOfType<Transform>();
-        foreach (Transform t in transforms)
-        {
-            if (t.name.Contains("Pivot"))
-            {
+        foreach (Transform t in transforms) {
+            if (t.name.Contains("Pivot")) {
                 GameObject prefabParent = null;
-                if (UnityEditor.EditorUtility.IsPersistent(t))
-                {
+                if (UnityEditor.EditorUtility.IsPersistent(t)) {
                     prefabParent =
                         UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(t.gameObject)
                         as GameObject;
@@ -935,14 +817,12 @@ static void SetPivotScalesToOne()
                 Transform pivot = t;
                 Transform tempParent = pivot.parent;
                 Transform child = null;
-                if (pivot.childCount > 0)
-                {
+                if (pivot.childCount > 0) {
                     child = pivot.GetChild(0);
                     child.parent = null;
                 }
                 pivot.parent = null;
-                if (pivot.localScale != Vector3.one)
-                {
+                if (pivot.localScale != Vector3.one) {
                     Debug.Log(
                         "Found pivot with non-uniform scale ("
                             + pivot.localScale.ToString()
@@ -951,13 +831,11 @@ static void SetPivotScalesToOne()
                     );
                 }
                 pivot.localScale = Vector3.one;
-                if (child != null)
-                {
+                if (child != null) {
                     child.parent = pivot;
                 }
                 pivot.parent = tempParent;
-                if (prefabParent != null)
-                {
+                if (prefabParent != null) {
                     Debug.Log("Reconnecting to " + prefabParent.name);
                     UnityEditor.PrefabUtility.RevertPrefabInstance(
                         t.gameObject,
@@ -972,8 +850,7 @@ static void SetPivotScalesToOne()
     }
 
     [UnityEditor.MenuItem("AI2-THOR/Add Pickupable Objects to Physics Scene Manager")]
-    static void AddPickupableObjectsToPhysicsSceneManager()
-    {
+    static void AddPickupableObjectsToPhysicsSceneManager() {
         PhysicsSceneManager physicsSceneManager =
             GameObject.FindObjectOfType<PhysicsSceneManager>();
 
@@ -982,16 +859,13 @@ static void AddPickupableObjectsToPhysicsSceneManager()
         if (
             physicsSceneManager.RequiredObjects.Count != 0
             || physicsSceneManager.SpawnedObjects.Count != 0
-        )
-        {
+        ) {
             physicsSceneManager.RequiredObjects.Clear();
             physicsSceneManager.RequiredObjects.Clear();
         }
 
-        foreach (SimObjPhysics simObj in simObjPhysicsArray)
-        {
-            if (simObj.PrimaryProperty == SimObjPrimaryProperty.CanPickup)
-            {
+        foreach (SimObjPhysics simObj in simObjPhysicsArray) {
+            if (simObj.PrimaryProperty == SimObjPrimaryProperty.CanPickup) {
                 physicsSceneManager.RequiredObjects.Add(simObj.gameObject);
                 physicsSceneManager.SpawnedObjects.Add(simObj.gameObject);
             }
diff --git a/unity/Assets/Scripts/SliceObject.cs b/unity/Assets/Scripts/SliceObject.cs
index 593287d195..7a80f9af98 100644
--- a/unity/Assets/Scripts/SliceObject.cs
+++ b/unity/Assets/Scripts/SliceObject.cs
@@ -5,8 +5,7 @@
 using UnityEngine.Rendering;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public class SliceObject : MonoBehaviour
-{
+public class SliceObject : MonoBehaviour {
     // prefab that this object should change to when "sliced"
     [Header("Object To Change To")]
     [SerializeField]
@@ -17,28 +16,24 @@ public class SliceObject : MonoBehaviour
     [SerializeField]
     protected bool isSliced = false;
 
-    public bool IsSliced()
-    {
+    public bool IsSliced() {
         return isSliced;
     }
 
-    void OnEnable()
-    {
+    void OnEnable() {
 #if UNITY_EDITOR
         // debug check for missing property
         if (
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeSliced)
-        )
-        {
+        ) {
             Debug.LogError(
                 gameObject.transform.name + " is missing the Secondary Property CanBeSliced!"
             );
         }
 
-        if (ObjectToChangeTo == null)
-        {
+        if (ObjectToChangeTo == null) {
             Debug.LogError(gameObject.transform.name + " is missing Object To Change To!");
         }
 
@@ -60,11 +55,9 @@ void Start() { }
     void Update() { }
 
     // action to be called from PhysicsRemoteFPSAgentController
-    public void Slice()
-    {
+    public void Slice() {
         // if this is already sliced, we can't slice again so yeah stop that
-        if (isSliced == true)
-        {
+        if (isSliced == true) {
             return;
         }
 
@@ -74,8 +67,7 @@ public void Slice()
         rb.isKinematic = true;
 
         // turn off everything except the top object, so we can continue to report back isSliced meta info without the object being "active"
-        foreach (Transform t in gameObject.transform)
-        {
+        foreach (Transform t in gameObject.transform) {
             t.gameObject.SetActive(false);
         }
 
@@ -85,8 +77,7 @@ public void Slice()
             !gameObject
                 .GetComponent<SimObjPhysics>()
                 .DoesThisObjectHaveThisSecondaryProperty(SimObjSecondaryProperty.CanBeCooked)
-        )
-        {
+        ) {
             // instantiate the normal object if this object is not cooked, otherwise....
             resultObject = Instantiate(
                 original: ObjectToChangeTo,
@@ -97,8 +88,7 @@ public void Slice()
             isSliced = true;
         }
         // if the object can be cooked, check if it is cooked and then spawn the cooked object to change to, otherwise spawn the normal object
-        else
-        {
+        else {
             // instantiate the normal object if this object is not cooked, otherwise....
             resultObject = Instantiate(
                 original: ObjectToChangeTo,
@@ -108,11 +98,9 @@ public void Slice()
             resultObject.transform.parent = GameObject.Find("Objects").transform;
             isSliced = true;
 
-            if (gameObject.GetComponent<CookObject>().IsCooked())
-            {
+            if (gameObject.GetComponent<CookObject>().IsCooked()) {
                 // cook all objects under the resultObject
-                foreach (Transform t in resultObject.transform)
-                {
+                foreach (Transform t in resultObject.transform) {
                     t.GetComponent<CookObject>().Cook();
                 }
             }
@@ -121,16 +109,13 @@ public void Slice()
         PhysicsSceneManager psm = GameObject
             .Find("PhysicsSceneManager")
             .GetComponent<PhysicsSceneManager>();
-        if (psm != null)
-        {
+        if (psm != null) {
             // if the spawned object is not a sim object itself, but if it's holding a ton of sim objects let's go
-            if (!resultObject.transform.GetComponent<SimObjPhysics>())
-            {
+            if (!resultObject.transform.GetComponent<SimObjPhysics>()) {
                 // each instantiated sliced version of the object is a bunch of sim objects held by a master parent transform, so go into each one and assign the id to each based on the parent's id so
                 // there is an association with the original source object
                 int count = 0;
-                foreach (Transform t in resultObject.transform)
-                {
+                foreach (Transform t in resultObject.transform) {
                     SimObjPhysics tsop = t.GetComponent<SimObjPhysics>();
                     psm.Generate_InheritedObjectID(
                         gameObject.GetComponent<SimObjPhysics>(),
@@ -149,11 +134,9 @@ public void Slice()
                 }
             }
             // the spawned object is a sim object itself, so make an ID for it
-            else
-            {
+            else {
                 // quick if the result object is an egg hard set it's rotation because EGGS ARE WEIRD and are not the same form as their shelled version
-                if (resultObject.GetComponent<SimObjPhysics>().Type == SimObjType.EggCracked)
-                {
+                if (resultObject.GetComponent<SimObjPhysics>().Type == SimObjType.EggCracked) {
                     resultObject.transform.rotation = Quaternion.Euler(Vector3.zero);
                 }
 
@@ -171,9 +154,7 @@ public void Slice()
                 // also add the spawned object's RB to the cache of all rigidbodies in scene
                 psm.AddToRBSInScene(resultrb);
             }
-        }
-        else
-        {
+        } else {
             Debug.LogError("Physics Scene Manager object is missing from scene!");
         }
 
@@ -182,10 +163,8 @@ public void Slice()
             .Find("PhysicsSceneManager")
             .GetComponent<AgentManager>()
             .PrimaryAgent;
-        if (primaryAgent.imageSynthesis)
-        {
-            if (primaryAgent.imageSynthesis.enabled)
-            {
+        if (primaryAgent.imageSynthesis) {
+            if (primaryAgent.imageSynthesis.enabled) {
                 primaryAgent.imageSynthesis.OnSceneChange();
             }
         }
diff --git a/unity/Assets/Scripts/SpongeClean.cs b/unity/Assets/Scripts/SpongeClean.cs
index b37394f9bf..d173766440 100644
--- a/unity/Assets/Scripts/SpongeClean.cs
+++ b/unity/Assets/Scripts/SpongeClean.cs
@@ -2,18 +2,15 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class SpongeClean : MonoBehaviour
-{
+public class SpongeClean : MonoBehaviour {
     // Start is called before the first frame update
     void Start() { }
 
     // Update is called once per frame
     void Update() { }
 
-    public void OnTriggerEnter(Collider other)
-    {
-        if (other.CompareTag("Dirt") || other.CompareTag("Pen"))
-        {
+    public void OnTriggerEnter(Collider other) {
+        if (other.CompareTag("Dirt") || other.CompareTag("Pen")) {
             //other.transform.position = other.transform.position + new Vector3(0, 1.0f, 0);
             Destroy(other.transform.gameObject);
         }
diff --git a/unity/Assets/Scripts/StandardShaderUtils.cs b/unity/Assets/Scripts/StandardShaderUtils.cs
index 739cd7db4e..3089a6267f 100644
--- a/unity/Assets/Scripts/StandardShaderUtils.cs
+++ b/unity/Assets/Scripts/StandardShaderUtils.cs
@@ -2,20 +2,16 @@
 
 using UnityEngine;
 
-public static class StandardShaderUtils
-{
-    public enum BlendMode
-    {
+public static class StandardShaderUtils {
+    public enum BlendMode {
         Opaque,
         Cutout,
         Fade,
         Transparent
     }
 
-    public static void ChangeRenderMode(Material standardShaderMaterial, BlendMode blendMode)
-    {
-        switch (blendMode)
-        {
+    public static void ChangeRenderMode(Material standardShaderMaterial, BlendMode blendMode) {
+        switch (blendMode) {
             case BlendMode.Opaque:
                 standardShaderMaterial.SetInt(
                     "_SrcBlend",
diff --git a/unity/Assets/Scripts/StoveKnob.cs b/unity/Assets/Scripts/StoveKnob.cs
index dfdc88d38b..b214722c35 100644
--- a/unity/Assets/Scripts/StoveKnob.cs
+++ b/unity/Assets/Scripts/StoveKnob.cs
@@ -5,8 +5,7 @@
 
 //[ExecuteInEditMode]
 [RequireComponent(typeof(SimObj))]
-public class StoveKnob : MonoBehaviour
-{
+public class StoveKnob : MonoBehaviour {
     public SimObj StoveRange;
     public bool On = false;
 
@@ -17,30 +16,24 @@ public class StoveKnob : MonoBehaviour
     SimObj simObj;
     bool displayedError = false;
 
-    void Awake()
-    {
+    void Awake() {
         simObj = gameObject.GetComponent<SimObj>();
     }
 
-    void Update()
-    {
-        if (KnobTransform == null || StoveRange == null)
-        {
-            if (!displayedError)
-            {
+    void Update() {
+        if (KnobTransform == null || StoveRange == null) {
+            if (!displayedError) {
                 displayedError = true;
                 Debug.LogError("Knob transform or stove range null in Stove Knob " + name);
             }
             return;
         }
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             KnobTransform.localEulerAngles = On ? OnRotation : OffRotation;
             return;
         }
 
-        if (!simObj.IsAnimated)
-        {
+        if (!simObj.IsAnimated) {
             return;
         }
 
diff --git a/unity/Assets/Scripts/StoveTopElectric.cs b/unity/Assets/Scripts/StoveTopElectric.cs
index 93e6e8e594..564f0c9986 100644
--- a/unity/Assets/Scripts/StoveTopElectric.cs
+++ b/unity/Assets/Scripts/StoveTopElectric.cs
@@ -2,8 +2,7 @@
 using System.Collections;
 using UnityEngine;
 
-public class StoveTopElectric : MonoBehaviour
-{
+public class StoveTopElectric : MonoBehaviour {
     public SimObj ParentObj;
     public Material BurnerOnMat;
     public int MatIndex;
@@ -12,16 +11,14 @@ public class StoveTopElectric : MonoBehaviour
     Material[] matArrayOn;
     Material[] matArrayOff;
 
-    void Awake()
-    {
+    void Awake() {
         ParentObj = gameObject.GetComponent<SimObj>();
         matArrayOn = BurnerRenderer.sharedMaterials;
         matArrayOff = BurnerRenderer.sharedMaterials;
         matArrayOn[MatIndex] = BurnerOnMat;
     }
 
-    void Update()
-    {
+    void Update() {
         BurnerRenderer.sharedMaterials = ParentObj.Animator.GetBool("AnimState1")
             ? matArrayOn
             : matArrayOff;
diff --git a/unity/Assets/Scripts/StretchAgentController.cs b/unity/Assets/Scripts/StretchAgentController.cs
index a67cd37ebf..e342445345 100644
--- a/unity/Assets/Scripts/StretchAgentController.cs
+++ b/unity/Assets/Scripts/StretchAgentController.cs
@@ -8,10 +8,8 @@
 using UnityEngine.Rendering.PostProcessing;
 using UnityEngine.UIElements;
 
-namespace UnityStandardAssets.Characters.FirstPerson
-{
-    public partial class StretchAgentController : ArmAgentController
-    {
+namespace UnityStandardAssets.Characters.FirstPerson {
+    public partial class StretchAgentController : ArmAgentController {
         public int gripperOpennessState = 0;
 
         //define default parameters for both main camera and secondary camera, specific to real-life stretch bot rig
@@ -38,8 +36,7 @@ AgentManager agentManager
         )
             : base(baseAgentComponent, agentManager) { }
 
-        public override void updateImageSynthesis(bool status)
-        {
+        public override void updateImageSynthesis(bool status) {
             base.updateImageSynthesis(status);
 
             // updateImageSynthesis is run in BaseFPSController's Initialize method after the
@@ -50,8 +47,7 @@ public override void updateImageSynthesis(bool status)
             agentManager.updateThirdPartyCameraImageSynthesis(status);
         }
 
-        public override ActionFinished InitializeBody(ServerAction initializeAction)
-        {
+        public override ActionFinished InitializeBody(ServerAction initializeAction) {
             VisibilityCapsule = StretchVisCap;
             m_CharacterController.center = new Vector3(0, -0.1821353f, -0.1092373f);
             m_CharacterController.radius = 0.1854628f;
@@ -79,8 +75,7 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
                 .GetComponent<Camera>();
             fp_camera_2.gameObject.SetActive(true);
             agentManager.registerAsThirdPartyCamera(fp_camera_2);
-            if (initializeAction.antiAliasing != null)
-            {
+            if (initializeAction.antiAliasing != null) {
                 agentManager.updateAntiAliasing(
                     postProcessLayer: fp_camera_2.gameObject.GetComponentInChildren<PostProcessLayer>(),
                     antiAliasing: initializeAction.antiAliasing
@@ -98,21 +93,15 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
             fp_camera_2.fieldOfView = defaultSecondaryCameraFieldOfView;
 
             // limit camera from looking too far down/up
-            if (Mathf.Approximately(initializeAction.maxUpwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(initializeAction.maxUpwardLookAngle, 0.0f)) {
                 this.maxUpwardLookAngle = 25f;
-            }
-            else
-            {
+            } else {
                 this.maxUpwardLookAngle = initializeAction.maxUpwardLookAngle;
             }
 
-            if (Mathf.Approximately(initializeAction.maxDownwardLookAngle, 0.0f))
-            {
+            if (Mathf.Approximately(initializeAction.maxDownwardLookAngle, 0.0f)) {
                 this.maxDownwardLookAngle = 90f;
-            }
-            else
-            {
+            } else {
                 this.maxDownwardLookAngle = initializeAction.maxDownwardLookAngle;
             }
 
@@ -122,8 +111,7 @@ public override ActionFinished InitializeBody(ServerAction initializeAction)
                 out secondaryCameraParams
             );
 
-            if (setSecondaryParams.GetValueOrDefault())
-            {
+            if (setSecondaryParams.GetValueOrDefault()) {
                 CameraParameters.setCameraParameters(fp_camera_2, secondaryCameraParams);
             }
 
@@ -145,12 +133,10 @@ out secondaryCameraParams
             return ActionFinished.Success;
         }
 
-        private ArmController getArmImplementation()
-        {
+        private ArmController getArmImplementation() {
             Stretch_Robot_Arm_Controller arm =
                 GetComponentInChildren<Stretch_Robot_Arm_Controller>();
-            if (arm == null)
-            {
+            if (arm == null) {
                 throw new InvalidOperationException(
                     "Agent does not have Stretch arm or is not enabled.\n"
                         + $"Make sure there is a '{typeof(Stretch_Robot_Arm_Controller).Name}' component as a child of this agent."
@@ -159,8 +145,7 @@ private ArmController getArmImplementation()
             return arm;
         }
 
-        protected override ArmController getArm()
-        {
+        protected override ArmController getArm() {
             return getArmImplementation();
         }
 
@@ -169,8 +154,7 @@ public bool teleportArm(
             float? rotation = null,
             bool worldRelative = false,
             bool forceAction = false
-        )
-        {
+        ) {
             Stretch_Robot_Arm_Controller arm =
                 getArmImplementation() as Stretch_Robot_Arm_Controller;
             GameObject posRotManip = arm.GetArmTarget();
@@ -180,39 +164,31 @@ public bool teleportArm(
             float oldLocalRotationAngle = posRotManip.transform.localEulerAngles.y;
 
             // establish defaults in the absence of inputs
-            if (position == null)
-            {
+            if (position == null) {
                 position = new Vector3(0f, 0.1f, 0f);
             }
 
-            if (rotation == null)
-            {
+            if (rotation == null) {
                 rotation = -180f;
             }
 
             // teleport arm!
-            if (!worldRelative)
-            {
+            if (!worldRelative) {
                 posRotManip.transform.localPosition = (Vector3)position;
                 posRotManip.transform.localEulerAngles = new Vector3(0, (float)rotation % 360, 0);
-            }
-            else
-            {
+            } else {
                 posRotManip.transform.position = (Vector3)position;
                 posRotManip.transform.eulerAngles = new Vector3(0, (float)rotation % 360, 0);
             }
 
             bool success = false;
             arm.ContinuousUpdate(0f);
-            if ((!forceAction) && SArm.IsArmColliding())
-            {
+            if ((!forceAction) && SArm.IsArmColliding()) {
                 errorMessage = "collision detected at desired transform, cannot teleport";
                 posRotManip.transform.localPosition = oldLocalPosition;
                 posRotManip.transform.localEulerAngles = new Vector3(0, oldLocalRotationAngle, 0);
                 arm.ContinuousUpdate(0f);
-            }
-            else
-            {
+            } else {
                 success = true;
             }
             arm.resetPosRotManipulator();
@@ -224,8 +200,7 @@ public void TeleportArm(
             float? rotation = null,
             bool worldRelative = false,
             bool forceAction = false
-        )
-        {
+        ) {
             actionFinished(
                 teleportArm(
                     position: position,
@@ -256,10 +231,8 @@ public ActionFinished TryReachObject(
             string objectId,
             Vector3? position = null,
             bool returnToInitialPosition = false
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 return new ActionFinished() { success = false, toEmitState = true };
             }
@@ -276,8 +249,7 @@ public ActionFinished TryReachObject(
             Vector3 oldArmLocalEulerAngles = armTarget.transform.localEulerAngles;
             int oldGripperOpenState = gripperOpennessState;
 
-            if (position.HasValue)
-            {
+            if (position.HasValue) {
                 transform.position = position.Value;
                 Physics.SyncTransforms();
             }
@@ -305,8 +277,7 @@ public ActionFinished TryReachObject(
             bool success = false;
             Vector3 pointOnObject = Vector3.zero;
 
-            foreach (Vector3 point in closePoints)
-            {
+            foreach (Vector3 point in closePoints) {
 #if UNITY_EDITOR
                 Debug.DrawLine(point, point + transform.up * 0.3f, Color.red, 20f);
 #endif
@@ -352,8 +323,7 @@ public ActionFinished TryReachObject(
                         rotation: armTarget.transform.eulerAngles.y,
                         worldRelative: true
                     )
-                )
-                {
+                ) {
 # if UNITY_EDITOR
                     Debug.Log("Agent arm is colliding after teleporting arm");
 # endif
@@ -361,8 +331,7 @@ public ActionFinished TryReachObject(
                 }
 
                 Physics.SyncTransforms();
-                if (isAgentCapsuleColliding(null))
-                {
+                if (isAgentCapsuleColliding(null)) {
 # if UNITY_EDITOR
                     Debug.Log("Agent capsule is colliding after teleporting arm");
 # endif
@@ -370,17 +339,14 @@ public ActionFinished TryReachObject(
                 }
 
                 bool touchingObject = false;
-                foreach (SimObjPhysics sop in arm.WhatObjectsAreInsideMagnetSphereAsSOP(false))
-                {
-                    if (sop.ObjectID == objectId)
-                    {
+                foreach (SimObjPhysics sop in arm.WhatObjectsAreInsideMagnetSphereAsSOP(false)) {
+                    if (sop.ObjectID == objectId) {
                         touchingObject = true;
                         break;
                     }
                 }
 
-                if (!touchingObject)
-                {
+                if (!touchingObject) {
 # if UNITY_EDITOR
                     Debug.Log("Agent is not touching object after teleporting arm");
 # endif
@@ -396,8 +362,7 @@ public ActionFinished TryReachObject(
             }
 
             Dictionary<string, Vector3> actionReturn = null;
-            if (success)
-            {
+            if (success) {
                 actionReturn = new Dictionary<string, Vector3>()
                 {
                     { "position", transform.position },
@@ -408,8 +373,7 @@ public ActionFinished TryReachObject(
                 };
             }
 
-            if (returnToInitialPosition)
-            {
+            if (returnToInitialPosition) {
                 teleportArm(
                     position: oldArmLocalPosition,
                     rotation: oldArmLocalEulerAngles.y,
@@ -422,8 +386,7 @@ public ActionFinished TryReachObject(
                 Physics.SyncTransforms();
             }
 
-            return new ActionFinished()
-            {
+            return new ActionFinished() {
                 success = success,
                 actionReturn = actionReturn,
                 toEmitState = returnToInitialPosition
@@ -453,15 +416,12 @@ public ActionFinished GetTouchingPoses(
             Vector3[] positions = null,
             float maxDistance = 1f,
             int maxPoses = int.MaxValue // works like infinity
-        )
-        {
-            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId))
-            {
+        ) {
+            if (!physicsSceneManager.ObjectIdToSimObjPhysics.ContainsKey(objectId)) {
                 errorMessage = $"Cannot find object with id {objectId}.";
                 return new ActionFinished() { success = false, toEmitState = true };
             }
-            if (maxPoses <= 0)
-            {
+            if (maxPoses <= 0) {
                 throw new ArgumentOutOfRangeException("maxPoses must be > 0.");
             }
 
@@ -470,8 +430,7 @@ public ActionFinished GetTouchingPoses(
             Vector3 bboxSize = sop.AxisAlignedBoundingBox.size;
             float fudgeFactor = Mathf.Sqrt(bboxSize.x * bboxSize.x + bboxSize.z * bboxSize.z) / 2f;
 
-            if (positions == null)
-            {
+            if (positions == null) {
                 positions = getReachablePositions();
             }
 
@@ -485,16 +444,14 @@ public ActionFinished GetTouchingPoses(
                 .ToList();
 
             List<object> poses = new List<object>();
-            foreach (Vector3 position in filteredPositions)
-            {
+            foreach (Vector3 position in filteredPositions) {
                 ActionFinished af = TryReachObject(
                     objectId: objectId,
                     position: position,
                     returnToInitialPosition: true
                 );
 
-                if (af.success)
-                {
+                if (af.success) {
                     poses.Add(af.actionReturn);
 # if UNITY_EDITOR
                     Debug.DrawLine(
@@ -506,8 +463,7 @@ public ActionFinished GetTouchingPoses(
 # endif
                 }
 
-                if (poses.Count >= maxPoses)
-                {
+                if (poses.Count >= maxPoses) {
                     break;
                 }
             }
@@ -525,11 +481,9 @@ public override IEnumerator RotateWristRelative(
             float roll = 0f,
             float speed = 10f,
             bool returnToStart = true
-        )
-        {
+        ) {
             // pitch and roll are not supported for the stretch and so we throw an error
-            if (pitch != 0f || roll != 0f)
-            {
+            if (pitch != 0f || roll != 0f) {
                 throw new System.NotImplementedException(
                     "Pitch and roll are not supported for the stretch agent."
                 );
@@ -555,11 +509,9 @@ public IEnumerator RotateWrist(
             float roll = 0f,
             float speed = 10f,
             bool returnToStart = true
-        )
-        {
+        ) {
             // pitch and roll are not supported for the stretch and so we throw an error
-            if (pitch != 0f || roll != 0f)
-            {
+            if (pitch != 0f || roll != 0f) {
                 throw new System.NotImplementedException(
                     "Pitch and roll are not supported for the stretch agent."
                 );
@@ -572,16 +524,14 @@ public IEnumerator RotateWrist(
 
             // Normalize target yaw to be bounded by [0, 360) (startingRotation is defaults to this)
             yaw %= 360;
-            if (yaw < 0)
-            {
+            if (yaw < 0) {
                 yaw += 360;
             }
 
             // Find shortest relativeRotation to feed into rotateWrist
             yaw -= startingRotation;
 
-            if (Mathf.Abs(yaw) > 180)
-            {
+            if (Mathf.Abs(yaw) > 180) {
                 yaw = (Mathf.Abs(yaw) - 360) * Mathf.Sign(yaw);
             }
 
@@ -595,66 +545,45 @@ public IEnumerator RotateWrist(
             );
         }
 
-        protected int gripperOpenFloatToState(float openness)
-        {
-            if (-100 <= openness && openness < 0)
-            {
+        protected int gripperOpenFloatToState(float openness) {
+            if (-100 <= openness && openness < 0) {
                 return 0;
-            }
-            else if (0 <= openness && openness < 5)
-            {
+            } else if (0 <= openness && openness < 5) {
                 return 1;
-            }
-            else if (5 <= openness && openness < 15)
-            {
+            } else if (5 <= openness && openness < 15) {
                 return 2;
-            }
-            else if (15 <= openness && openness < 25)
-            {
+            } else if (15 <= openness && openness < 25) {
                 return 3;
-            }
-            else if (25 <= openness && openness < 35)
-            {
+            } else if (25 <= openness && openness < 35) {
                 return 4;
-            }
-            else if (35 <= openness && openness < 45)
-            {
+            } else if (35 <= openness && openness < 45) {
                 return 5;
-            }
-            else if (45 <= openness && openness <= 50)
-            {
+            } else if (45 <= openness && openness <= 50) {
                 return 6;
-            }
-            else
-            {
+            } else {
                 throw new InvalidOperationException(
                     $"Invalid value for `openness`: '{openness}'. Value should be between -100 and 50"
                 );
             }
         }
 
-        public ActionFinished SetGripperOpenness(float? openness, int? openState = null)
-        {
+        public ActionFinished SetGripperOpenness(float? openness, int? openState = null) {
             setGripperOpenness(openness: openness, openState: openState);
             return ActionFinished.Success;
         }
 
         //moving this to a helper function so we can call it without sending back an ActionFinished call
-        public void setGripperOpenness(float? openness, int? openState = null)
-        {
-            if (openness.HasValue == openState.HasValue)
-            {
+        public void setGripperOpenness(float? openness, int? openState = null) {
+            if (openness.HasValue == openState.HasValue) {
                 throw new InvalidOperationException(
                     $"Only one of openness or openState should have a value"
                 );
             }
-            if (openness.HasValue)
-            {
+            if (openness.HasValue) {
                 openState = gripperOpenFloatToState(openness.Value);
             }
 
-            foreach (GameObject opennessState in GripperOpennessStates)
-            {
+            foreach (GameObject opennessState in GripperOpennessStates) {
                 opennessState.SetActive(false);
             }
 
@@ -684,19 +613,14 @@ public void setGripperOpenness(float? openness, int? openState = null)
         //            actionFinished(true);
         //        }
 
-        public void RotateCameraMount(float degrees, bool secondary = false)
-        {
+        public void RotateCameraMount(float degrees, bool secondary = false) {
             var minDegree = -80.00001f;
             var maxDegree = 80.00001f;
-            if (degrees >= minDegree && degrees <= maxDegree)
-            {
+            if (degrees >= minDegree && degrees <= maxDegree) {
                 Camera cam;
-                if (secondary)
-                {
+                if (secondary) {
                     cam = agentManager.thirdPartyCameras[0];
-                }
-                else
-                {
+                } else {
                     cam = m_Camera;
                 }
                 AgentManager.OptionalVector3 localEulerAngles = new AgentManager.OptionalVector3(
@@ -706,37 +630,29 @@ public void RotateCameraMount(float degrees, bool secondary = false)
                 );
 
                 int agentId = -1;
-                for (int i = 0; i < agentManager.agents.Count; i++)
-                {
-                    if (agentManager.agents[i] == this)
-                    {
+                for (int i = 0; i < agentManager.agents.Count; i++) {
+                    if (agentManager.agents[i] == this) {
                         agentId = i;
                         break;
                     }
                 }
-                if (agentId != 0)
-                {
+                if (agentId != 0) {
                     errorMessage = "Only the primary agent can rotate the camera for now.";
                     actionFinished(false);
                     return;
                 }
 
-                if (secondary)
-                {
+                if (secondary) {
                     agentManager.UpdateThirdPartyCamera(
                         thirdPartyCameraId: 0,
                         rotation: localEulerAngles,
                         agentPositionRelativeCoordinates: true,
                         agentId: agentId
                     );
-                }
-                else
-                {
+                } else {
                     agentManager.UpdateMainCamera(rotation: localEulerAngles);
                 }
-            }
-            else
-            {
+            } else {
                 errorMessage =
                     $"Invalid value for `degrees`: '{degrees}'. Value should be between '{minDegree}' and '{maxDegree}'.";
                 actionFinished(false);
diff --git a/unity/Assets/Scripts/Stretch_Robot_Arm_Controller.cs b/unity/Assets/Scripts/Stretch_Robot_Arm_Controller.cs
index 57b20468c0..b8d325dcdb 100644
--- a/unity/Assets/Scripts/Stretch_Robot_Arm_Controller.cs
+++ b/unity/Assets/Scripts/Stretch_Robot_Arm_Controller.cs
@@ -5,8 +5,7 @@
 using UnityEngine;
 using UnityStandardAssets.Characters.FirstPerson;
 
-public partial class Stretch_Robot_Arm_Controller : ArmController
-{
+public partial class Stretch_Robot_Arm_Controller : ArmController {
     [SerializeField]
     private Transform armBase,
         handCameraTransform,
@@ -25,84 +24,65 @@ public partial class Stretch_Robot_Arm_Controller : ArmController
 
     private bool deadZoneCheck;
 
-    public override Transform pickupParent()
-    {
+    public override Transform pickupParent() {
         return magnetSphere.transform;
     }
 
-    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 wristSpaceOffsetToWorldPos(Vector3 offset) {
         return handCameraTransform.TransformPoint(offset)
             - handCameraTransform.position
             + WristToManipulator;
     }
 
-    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset)
-    {
+    public override Vector3 armBaseSpaceOffsetToWorldPos(Vector3 offset) {
         return this.transform.TransformPoint(offset) - this.transform.position;
     }
 
-    public override Vector3 pointToWristSpace(Vector3 point)
-    {
+    public override Vector3 pointToWristSpace(Vector3 point) {
         return handCameraTransform.TransformPoint(point) + WristToManipulator;
     }
 
-    public override Vector3 pointToArmBaseSpace(Vector3 point)
-    {
+    public override Vector3 pointToArmBaseSpace(Vector3 point) {
         return armBase.transform.TransformPoint(point);
     }
 
-    public override void ContinuousUpdate(float fixedDeltaTime)
-    {
+    public override void ContinuousUpdate(float fixedDeltaTime) {
         solver.ManipulateStretchArm();
     }
 
-    private bool DeadZoneCheck()
-    {
-        if (deadZoneCheck)
-        {
+    private bool DeadZoneCheck() {
+        if (deadZoneCheck) {
             float currentYaw = armTarget.localRotation.eulerAngles.y;
             float cLimit = wristClockwiseLocalRotationLimit;
             float ccLimit = wristCounterClockwiseLocalRotationLimit;
 
             // Consolidate reachable euler-rotations (which are normally bounded by [0, 360)) into a continuous number line,
             // bounded instead by [continuousCounterClockwiseLocalRotationLimit, continuousClockwiseLocalRotationLimit + 360)
-            if (cLimit < ccLimit)
-            {
+            if (cLimit < ccLimit) {
                 cLimit += 360;
-                if (currentYaw < ccLimit)
-                {
+                if (currentYaw < ccLimit) {
                     currentYaw += 360;
                 }
             }
 
-            if (currentYaw < ccLimit || currentYaw > cLimit)
-            {
+            if (currentYaw < ccLimit || currentYaw > cLimit) {
                 return true;
-            }
-            else
-            {
+            } else {
                 return false;
             }
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
 
-    public override bool ShouldHalt()
-    {
+    public override bool ShouldHalt() {
         return base.ShouldHalt() || DeadZoneCheck();
     }
 
-    public override string GetHaltMessage()
-    {
+    public override string GetHaltMessage() {
         var errorMessage = base.GetHaltMessage();
-        if (errorMessage == "")
-        {
-            if (DeadZoneCheck())
-            {
+        if (errorMessage == "") {
+            if (DeadZoneCheck()) {
                 errorMessage =
                     "Rotated up against Stretch arm wrist's dead-zone, could not reach target: '"
                     + armTarget.rotation
@@ -112,8 +92,7 @@ public override string GetHaltMessage()
         return errorMessage;
     }
 
-    public override GameObject GetArmTarget()
-    {
+    public override GameObject GetArmTarget() {
         return armTarget.gameObject;
     }
 
@@ -122,8 +101,7 @@ public override GameObject GetArmTarget()
     //     return ActionFinished.Success;
     //  }
 
-    void Start()
-    {
+    void Start() {
         this.collisionListener = this.GetComponentInParent<CollisionListener>();
         this.collisionListener.registerAllChildColliders();
 
@@ -137,10 +115,8 @@ void Start()
 
         // clean up arm colliders, removing triggers
         List<CapsuleCollider> cleanedCaps = new List<CapsuleCollider>();
-        foreach (CapsuleCollider c in armCaps)
-        {
-            if (!c.isTrigger)
-            {
+        foreach (CapsuleCollider c in armCaps) {
+            if (!c.isTrigger) {
                 cleanedCaps.Add(c);
             }
         }
@@ -148,10 +124,8 @@ void Start()
         ArmCapsuleColliders = cleanedCaps.ToArray();
 
         List<BoxCollider> cleanedBoxes = new List<BoxCollider>();
-        foreach (BoxCollider b in armBoxes)
-        {
-            if (!b.isTrigger)
-            {
+        foreach (BoxCollider b in armBoxes) {
+            if (!b.isTrigger) {
                 cleanedBoxes.Add(b);
             }
         }
@@ -162,10 +136,8 @@ void Start()
 
         // TODO: Currently explicitly ignoring all arm self collisions (for efficiency)!
         var colliders = this.GetComponentsInChildren<Collider>();
-        foreach (Collider c0 in colliders)
-        {
-            foreach (Collider c1 in colliders)
-            {
+        foreach (Collider c0 in colliders) {
+            foreach (Collider c1 in colliders) {
                 Physics.IgnoreCollision(c0, c1);
             }
         }
@@ -179,21 +151,18 @@ void Start()
         );
     }
 
-    public void resetPosRotManipulator()
-    {
+    public void resetPosRotManipulator() {
         Physics.SyncTransforms();
         armTarget.position = handCameraTransform.transform.position + WristToManipulator;
         ;
     }
 
-    protected override void lastStepCallback()
-    {
+    protected override void lastStepCallback() {
         resetPosRotManipulator();
         setDeadZoneCheck(false);
     }
 
-    public void setDeadZoneCheck(bool enabled)
-    {
+    public void setDeadZoneCheck(bool enabled) {
         deadZoneCheck = enabled;
     }
 
@@ -204,8 +173,7 @@ public IEnumerator rotateWrist(
         float fixedDeltaTime,
         bool returnToStartPositionIfFailed = false,
         bool isRelativeRotation = true
-    )
-    {
+    ) {
         // float clockwiseLocalRotationLimit = 77.5f;
         // float counterClockwiseLocalRotationLimit = 102.5f;
         float currentContinuousRotation,
@@ -223,32 +191,24 @@ public IEnumerator rotateWrist(
         // targetContinuousRotation is the end-rotation state on the bounds number-range
         // (which allows acute and obtuse rotation end-states to be distinct)
         // targetRelativeRotation is simply the final relative-rotation
-        if (isRelativeRotation)
-        {
-            if (Mathf.Abs(rotation) <= 180)
-            {
+        if (isRelativeRotation) {
+            if (Mathf.Abs(rotation) <= 180) {
                 targetRotation = armTarget.transform.rotation * Quaternion.Euler(0, rotation, 0);
-            }
-            else
-            {
+            } else {
                 // Calculate target and secTargetRotation
                 targetRelativeRotation = rotation / 2;
                 targetRotation =
                     armTarget.transform.rotation * Quaternion.Euler(0, targetRelativeRotation, 0);
                 secTargetRotation = targetRotation * Quaternion.Euler(0, targetRelativeRotation, 0);
             }
-        }
-        else
-        {
+        } else {
             // Consolidate reachable euler-rotations (which are normally bounded by [0, 360)) into a continuous number line,
             // bounded instead by [continuousCounterClockwiseLocalRotationLimit, continuousClockwiseLocalRotationLimit + 360)
             if (
                 continuousClockwiseLocalRotationLimit < continuousCounterClockwiseLocalRotationLimit
-            )
-            {
+            ) {
                 continuousClockwiseLocalRotationLimit += 360;
-                if (currentContinuousRotation < continuousCounterClockwiseLocalRotationLimit)
-                {
+                if (currentContinuousRotation < continuousCounterClockwiseLocalRotationLimit) {
                     currentContinuousRotation += 360;
                 }
             }
@@ -259,25 +219,19 @@ public IEnumerator rotateWrist(
             if (
                 targetContinuousRotation > continuousCounterClockwiseLocalRotationLimit
                 && targetContinuousRotation < continuousClockwiseLocalRotationLimit
-            )
-            {
+            ) {
                 targetRotation = armTarget.transform.rotation * Quaternion.Euler(0, rotation, 0);
 
                 // if angle is NOT reachable, find how close it can get from that direction
-            }
-            else
-            {
+            } else {
                 float nonReflexAngularDistance,
                     reflexAngularDistance;
 
                 // Calculate proximity of non-reflex angle extreme to target
-                if (targetContinuousRotation < continuousCounterClockwiseLocalRotationLimit)
-                {
+                if (targetContinuousRotation < continuousCounterClockwiseLocalRotationLimit) {
                     nonReflexAngularDistance =
                         continuousCounterClockwiseLocalRotationLimit - targetContinuousRotation;
-                }
-                else
-                {
+                } else {
                     nonReflexAngularDistance =
                         targetContinuousRotation - continuousClockwiseLocalRotationLimit;
                 }
@@ -291,37 +245,28 @@ public IEnumerator rotateWrist(
                 if (
                     secTargetContinuousRotation > continuousCounterClockwiseLocalRotationLimit
                     && secTargetContinuousRotation < continuousClockwiseLocalRotationLimit
-                )
-                {
+                ) {
                     targetRotation =
                         armTarget.transform.rotation
                         * Quaternion.Euler(0, targetRelativeRotation, 0);
                     secTargetRotation =
                         targetRotation * Quaternion.Euler(0, targetRelativeRotation, 0);
-                }
-                else
-                {
+                } else {
                     // Calculate proximity of reflex angle extreme to target
-                    if (secTargetContinuousRotation < continuousCounterClockwiseLocalRotationLimit)
-                    {
+                    if (secTargetContinuousRotation < continuousCounterClockwiseLocalRotationLimit) {
                         reflexAngularDistance =
                             continuousCounterClockwiseLocalRotationLimit
                             - secTargetContinuousRotation;
-                    }
-                    else
-                    { // if (secTargetContinuousRotation > continuousClockwiseLocalRotationLimit) {
+                    } else { // if (secTargetContinuousRotation > continuousClockwiseLocalRotationLimit) {
                         reflexAngularDistance =
                             secTargetContinuousRotation - continuousClockwiseLocalRotationLimit;
                     }
 
                     // Calculate which distance gets wrist closer to target
-                    if (nonReflexAngularDistance <= reflexAngularDistance)
-                    {
+                    if (nonReflexAngularDistance <= reflexAngularDistance) {
                         targetRotation =
                             armTarget.transform.rotation * Quaternion.Euler(0, rotation, 0);
-                    }
-                    else
-                    {
+                    } else {
                         targetRotation =
                             armTarget.transform.rotation
                             * Quaternion.Euler(0, targetRelativeRotation, 0);
@@ -363,8 +308,7 @@ public IEnumerator rotateWrist(
         );
     }
 
-    public override ArmMetadata GenerateMetadata()
-    {
+    public override ArmMetadata GenerateMetadata() {
         ArmMetadata meta = new ArmMetadata();
         // meta.handTarget = armTarget.position;
         Transform joint = transform;
@@ -377,18 +321,12 @@ public override ArmMetadata GenerateMetadata()
         Quaternion currentRotation;
 
         // Assign joint metadata to remaining joints, which all have identical hierarchies
-        for (int i = 1; i <= 8; i++)
-        {
-            if (i == 1)
-            {
+        for (int i = 1; i <= 8; i++) {
+            if (i == 1) {
                 joint = joint.Find("stretch_robot_lift_jnt");
-            }
-            else if (i <= 6)
-            {
+            } else if (i <= 6) {
                 joint = joint.Find("stretch_robot_arm_" + (i - 1) + "_jnt");
-            }
-            else
-            {
+            } else {
                 joint = joint.Find("stretch_robot_wrist_" + (i - 6) + "_jnt");
             }
 
@@ -412,8 +350,7 @@ public override ArmMetadata GenerateMetadata()
             currentRotation = joint.rotation;
 
             // Check that world-relative rotation is angle-axis-notation-compatible
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                 jointMeta.rotation = new Vector4(
                     vectorRot.x,
@@ -421,9 +358,7 @@ public override ArmMetadata GenerateMetadata()
                     vectorRot.z,
                     ConvertAngleToZeroCentricRange(angleRot * Mathf.Sign(vectorRot.y))
                 );
-            }
-            else
-            {
+            } else {
                 jointMeta.rotation = new Vector4(1, 0, 0, 0);
             }
 
@@ -436,8 +371,7 @@ public override ArmMetadata GenerateMetadata()
             currentRotation = Quaternion.Inverse(armBase.rotation) * joint.rotation;
 
             // Check that root-relative rotation is angle-axis-notation-compatible
-            if (currentRotation != new Quaternion(0, 0, 0, -1))
-            {
+            if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                 currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                 jointMeta.rootRelativeRotation = new Vector4(
                     vectorRot.x,
@@ -445,9 +379,7 @@ public override ArmMetadata GenerateMetadata()
                     vectorRot.z,
                     ConvertAngleToZeroCentricRange(angleRot * Mathf.Sign(vectorRot.y))
                 );
-            }
-            else
-            {
+            } else {
                 jointMeta.rootRelativeRotation = new Vector4(1, 0, 0, 0);
             }
 
@@ -456,16 +388,14 @@ public override ArmMetadata GenerateMetadata()
             // }
 
             // PARENT-JOINT RELATIVE ROTATION
-            if (i != 1)
-            {
+            if (i != 1) {
                 parentJoint = joint.parent;
 
                 // Grab rotation of current joint's angler relative to parent joint's angler
                 currentRotation = Quaternion.Inverse(parentJoint.rotation) * joint.rotation;
 
                 // Check that parent-relative rotation is angle-axis-notation-compatible
-                if (currentRotation != new Quaternion(0, 0, 0, -1))
-                {
+                if (currentRotation != new Quaternion(0, 0, 0, -1)) {
                     currentRotation.ToAngleAxis(angle: out angleRot, axis: out vectorRot);
                     jointMeta.localRotation = new Vector4(
                         vectorRot.x,
@@ -473,14 +403,10 @@ public override ArmMetadata GenerateMetadata()
                         vectorRot.z,
                         ConvertAngleToZeroCentricRange(angleRot * Mathf.Sign(vectorRot.y))
                     );
-                }
-                else
-                {
+                } else {
                     jointMeta.localRotation = new Vector4(1, 0, 0, 0);
                 }
-            }
-            else
-            {
+            } else {
                 // Special case for stretch_robot_lift_jnt because it has no parent-joint
                 jointMeta.localRotation = jointMeta.rootRelativeRotation;
             }
@@ -494,10 +420,8 @@ public override ArmMetadata GenerateMetadata()
         // note this is different from objects intersecting the hand's sphere,
         // there could be a case where an object is inside the sphere but not picked up by the hand
         List<string> heldObjectIDs = new List<string>();
-        if (heldObjects != null)
-        {
-            foreach (SimObjPhysics sop in heldObjects.Keys)
-            {
+        if (heldObjects != null) {
+            foreach (SimObjPhysics sop in heldObjects.Keys) {
                 heldObjectIDs.Add(sop.objectID);
             }
         }
@@ -521,22 +445,18 @@ public override ArmMetadata GenerateMetadata()
         return meta;
     }
 
-    float ConvertAngleToZeroCentricRange(float degrees)
-    {
-        if (degrees < 0)
-        {
+    float ConvertAngleToZeroCentricRange(float degrees) {
+        if (degrees < 0) {
             degrees = (degrees % 360f) + 360f;
         }
-        if (degrees > 180f)
-        {
+        if (degrees > 180f) {
             degrees = (degrees % 360f) - 360f;
         }
         return degrees;
     }
 
 #if UNITY_EDITOR
-    public class GizmoDrawCapsule
-    {
+    public class GizmoDrawCapsule {
         public Vector3 p0;
         public Vector3 p1;
         public float radius;
@@ -544,12 +464,9 @@ public class GizmoDrawCapsule
 
     List<GizmoDrawCapsule> debugCapsules = new List<GizmoDrawCapsule>();
 
-    private void OnDrawGizmos()
-    {
-        if (debugCapsules.Count > 0)
-        {
-            foreach (GizmoDrawCapsule thing in debugCapsules)
-            {
+    private void OnDrawGizmos() {
+        if (debugCapsules.Count > 0) {
+            foreach (GizmoDrawCapsule thing in debugCapsules) {
                 Gizmos.DrawWireSphere(thing.p0, thing.radius);
                 Gizmos.DrawWireSphere(thing.p1, thing.radius);
             }
diff --git a/unity/Assets/Scripts/StructureObject.cs b/unity/Assets/Scripts/StructureObject.cs
index 5f6f78d78d..d102b57bab 100644
--- a/unity/Assets/Scripts/StructureObject.cs
+++ b/unity/Assets/Scripts/StructureObject.cs
@@ -6,8 +6,7 @@
 
 // this is used to tag Structural objects in the scene. Structural objects are objects with physical collision and are rendered, but are not SimObjects themselves.
 // these objects are all located under the "Structure" object in the Heirarchy, and are always static and purely environmental.
-public class StructureObject : MonoBehaviour
-{
+public class StructureObject : MonoBehaviour {
     [SerializeField]
     public StructureObjectTag WhatIsMyStructureObjectTag;
 
@@ -19,8 +18,7 @@ void Update() { }
 }
 
 [Serializable]
-public enum StructureObjectTag : int
-{
+public enum StructureObjectTag : int {
     Undefined = 0,
     Wall = 1,
     Floor = 2,
diff --git a/unity/Assets/Scripts/SyncTransform.cs b/unity/Assets/Scripts/SyncTransform.cs
index 52df75b300..e888c945ca 100644
--- a/unity/Assets/Scripts/SyncTransform.cs
+++ b/unity/Assets/Scripts/SyncTransform.cs
@@ -2,10 +2,8 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class SyncTransform : MonoBehaviour
-{
-    protected enum WhatToTrack
-    {
+public class SyncTransform : MonoBehaviour {
+    protected enum WhatToTrack {
         Rotation,
         Position
     };
@@ -23,16 +21,11 @@ protected enum WhatToTrack
     void Start() { }
 
     // Update is called once per frame
-    void Update()
-    {
-        if (!StopSyncingForASecond)
-        {
-            if (WhichTransformPropertyAmITracking == WhatToTrack.Rotation)
-            {
+    void Update() {
+        if (!StopSyncingForASecond) {
+            if (WhichTransformPropertyAmITracking == WhatToTrack.Rotation) {
                 gameObject.transform.rotation = ThingIamTracking.transform.rotation;
-            }
-            else if (WhichTransformPropertyAmITracking == WhatToTrack.Position)
-            {
+            } else if (WhichTransformPropertyAmITracking == WhatToTrack.Position) {
                 gameObject.transform.localPosition = ThingIamTracking.transform.localPosition;
             }
         }
diff --git a/unity/Assets/Scripts/THORDocumentationExporter.cs b/unity/Assets/Scripts/THORDocumentationExporter.cs
index 83d9ace9e4..88a310bab6 100644
--- a/unity/Assets/Scripts/THORDocumentationExporter.cs
+++ b/unity/Assets/Scripts/THORDocumentationExporter.cs
@@ -8,12 +8,10 @@
 using UnityEditor;
 using UnityEditor.SceneManagement;
 
-public class THORDocumentationExporter : MonoBehaviour
-{
+public class THORDocumentationExporter : MonoBehaviour {
     // export the placement restrictions for each pickupable object
     [MenuItem("SimObjectPhysics/Generate Placement Restrictions to Text File")]
-    private static void ExportPlacementRestrictionsToTextFile()
-    {
+    private static void ExportPlacementRestrictionsToTextFile() {
         var file = "PlacementRestrictions.txt";
 
         var create = File.CreateText("Assets/DebugTextFiles/" + file);
@@ -23,12 +21,10 @@ private static void ExportPlacementRestrictionsToTextFile()
                 SimObjType,
                 List<SimObjType>
             > kvp in ReceptacleRestrictions.PlacementRestrictions
-        )
-        {
+        ) {
             // create.WriteLine("/////////////////////////////");
             create.WriteLine("Receptacle Restrictions for: " + kvp.Key.ToString());
-            foreach (SimObjType sop in kvp.Value)
-            {
+            foreach (SimObjType sop in kvp.Value) {
                 create.Write(sop.ToString() + ", ");
             }
             create.WriteLine("\n");
@@ -37,8 +33,7 @@ private static void ExportPlacementRestrictionsToTextFile()
         create.Close();
     }
 
-    public class TotalSimObjectsInScene
-    {
+    public class TotalSimObjectsInScene {
         // count of total number of sim objects in this scene
         public int TotalSimObjCountInScene;
 
@@ -46,8 +41,7 @@ public class TotalSimObjectsInScene
         public Dictionary<SimObjType, int> ObjectType_to_Count = new Dictionary<SimObjType, int>();
     }
 
-    public class UniqueSimObjectsInScene
-    {
+    public class UniqueSimObjectsInScene {
         // name of the asset if it is a prefab- via PrefabUtility.GetCorrsepondingObjectFromOriginalSource()
         public string assetName = "n/a"; // default to n/a in the case this isn't a prefab
 
@@ -62,8 +56,7 @@ public class UniqueSimObjectsInScene
     // print("original source: " + PrefabUtility.GetCorrespondingObjectFromOriginalSource(gameObject));
 
     [MenuItem("SimObjectPhysics/Generate Sim Obj Instance Count Text Files")]
-    private static void GetInstanceCount()
-    {
+    private static void GetInstanceCount() {
         // keep track of total number of sim objects across all scenes
         int totalInstanceCount = 0;
 
@@ -86,8 +79,7 @@ private static void GetInstanceCount()
 
         // Be sure to have the scenes you want to check for instances (and ONLY those scenes) int the build settings!
         // for each scene in the build do these things
-        for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCountInBuildSettings; i++)
-        {
+        for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCountInBuildSettings; i++) {
             UnityEditor.SceneManagement.EditorSceneManager.OpenScene(
                 SceneUtility.GetScenePathByBuildIndex(i),
                 OpenSceneMode.Single
@@ -103,47 +95,35 @@ private static void GetInstanceCount()
             string currentSceneName = UnityEngine
                 .SceneManagement.SceneManager.GetActiveScene()
                 .name;
-            if (!SceneName_to_Counts.ContainsKey(currentSceneName))
-            {
+            if (!SceneName_to_Counts.ContainsKey(currentSceneName)) {
                 TotalSimObjectsInScene tsois = new TotalSimObjectsInScene();
                 tsois.TotalSimObjCountInScene = simObjects.Length;
                 tsois.ObjectType_to_Count = sceneObjectTypeCounts;
                 SceneName_to_Counts.Add(currentSceneName, tsois);
             }
 
-            foreach (SimObjPhysics currentSimObject in simObjects)
-            {
+            foreach (SimObjPhysics currentSimObject in simObjects) {
                 // keep track of total object type count
-                if (ObjectTypeInAllScenes_to_Count.ContainsKey(currentSimObject.Type))
-                {
+                if (ObjectTypeInAllScenes_to_Count.ContainsKey(currentSimObject.Type)) {
                     ObjectTypeInAllScenes_to_Count[currentSimObject.Type]++;
-                }
-                else
-                {
+                } else {
                     ObjectTypeInAllScenes_to_Count.Add(currentSimObject.Type, 1);
                 }
 
                 // keep track of object type count for this scene only
-                if (sceneObjectTypeCounts.ContainsKey(currentSimObject.Type))
-                {
+                if (sceneObjectTypeCounts.ContainsKey(currentSimObject.Type)) {
                     sceneObjectTypeCounts[currentSimObject.Type]++;
-                }
-                else
-                {
+                } else {
                     sceneObjectTypeCounts.Add(currentSimObject.Type, 1);
                 }
 
                 // keep track of which scenes contain this object type
                 // key already exists, don't worry about creating new list
-                if (ObjectType_To_Scenes.ContainsKey(currentSimObject.Type))
-                {
-                    if (!ObjectType_To_Scenes[currentSimObject.Type].Contains(currentSceneName))
-                    {
+                if (ObjectType_To_Scenes.ContainsKey(currentSimObject.Type)) {
+                    if (!ObjectType_To_Scenes[currentSimObject.Type].Contains(currentSceneName)) {
                         ObjectType_To_Scenes[currentSimObject.Type].Add(currentSceneName);
                     }
-                }
-                else
-                {
+                } else {
                     List<String> listOfScenes = new List<String>();
                     listOfScenes.Add(currentSceneName);
                     ObjectType_To_Scenes.Add(currentSimObject.Type, listOfScenes);
@@ -158,18 +138,15 @@ private static void GetInstanceCount()
                     currentSimObject.gameObject
                 );
 
-                if (testObj != null)
-                {
+                if (testObj != null) {
                     // this prefab already exists in our dictionary
-                    if (UniquePrefab_to_Count.ContainsKey(testObj))
-                    {
+                    if (UniquePrefab_to_Count.ContainsKey(testObj)) {
                         // increment how many times this prefab has shown up
                         UniquePrefab_to_Count[testObj].count++;
                         if (
                             !UniquePrefab_to_Count[testObj]
                                 .Scenes_To_hName.ContainsKey(currentSceneName)
-                        )
-                        {
+                        ) {
                             // add any scenes where this prefab shows up
                             UniquePrefab_to_Count[testObj]
                                 .Scenes_To_hName.Add(
@@ -177,9 +154,7 @@ private static void GetInstanceCount()
                                     currentSimObject.gameObject.name
                                 );
                         }
-                    }
-                    else
-                    {
+                    } else {
                         UniqueSimObjectsInScene usois = new UniqueSimObjectsInScene();
                         usois.count = 1;
                         usois.Scenes_To_hName = new Dictionary<String, String>();
@@ -192,8 +167,7 @@ private static void GetInstanceCount()
                     }
                 }
                 // this sim object is not a prefab so assume it is unique to this scene only
-                else
-                {
+                else {
                     UniqueSimObjectsInScene usois = new UniqueSimObjectsInScene();
                     usois.count = 1;
                     usois.Scenes_To_hName = new Dictionary<String, String>();
@@ -218,8 +192,7 @@ private static void GetInstanceCount()
         create.WriteLine(
             "The following is the number of INSTANCES of each OBJECT TYPE that appears across ALL scenes:"
         );
-        foreach (KeyValuePair<SimObjType, int> typeSet in ObjectTypeInAllScenes_to_Count)
-        {
+        foreach (KeyValuePair<SimObjType, int> typeSet in ObjectTypeInAllScenes_to_Count) {
             create.WriteLine(typeSet.Key + ": " + typeSet.Value);
         }
         create.Close();
@@ -228,8 +201,7 @@ private static void GetInstanceCount()
         var file2 = "ObjectTypesPerScene.txt";
         var create2 = File.CreateText("Assets/DebugTextFiles/" + file2);
         create2.WriteLine("The following is the Total count of Sim Objects by Scene");
-        foreach (KeyValuePair<String, TotalSimObjectsInScene> entry in SceneName_to_Counts)
-        {
+        foreach (KeyValuePair<String, TotalSimObjectsInScene> entry in SceneName_to_Counts) {
             create2.WriteLine("\n" + "Scene Name: " + entry.Key);
             // key: scene, value: object with total count of instances in scene, count of each object by type in scene
             create2.WriteLine(
@@ -238,8 +210,7 @@ private static void GetInstanceCount()
                     + ": "
                     + entry.Value.TotalSimObjCountInScene
             );
-            foreach (KeyValuePair<SimObjType, int> pair in entry.Value.ObjectType_to_Count)
-            {
+            foreach (KeyValuePair<SimObjType, int> pair in entry.Value.ObjectType_to_Count) {
                 create2.WriteLine(
                     pair.Key + " | Total Instances In " + entry.Key + ": " + pair.Value
                 );
@@ -254,11 +225,9 @@ private static void GetInstanceCount()
         create3.WriteLine(
             "This contains a list of all Object Types and the Scenes which have at least one instance of the Object Type."
         );
-        foreach (KeyValuePair<SimObjType, List<String>> typeToScene in ObjectType_To_Scenes)
-        {
+        foreach (KeyValuePair<SimObjType, List<String>> typeToScene in ObjectType_To_Scenes) {
             create3.WriteLine("\n" + typeToScene.Key + ":");
-            foreach (string s in typeToScene.Value)
-            {
+            foreach (string s in typeToScene.Value) {
                 create3.WriteLine(s);
             }
         }
@@ -281,15 +250,13 @@ private static void GetInstanceCount()
         create4.WriteLine(
             "\nTotal number of UNIQUE Sim Object instances: " + UniquePrefab_to_Count.Count
         );
-        foreach (KeyValuePair<GameObject, UniqueSimObjectsInScene> p in UniquePrefab_to_Count)
-        {
+        foreach (KeyValuePair<GameObject, UniqueSimObjectsInScene> p in UniquePrefab_to_Count) {
             create4.WriteLine("\nbase prefab name (in assets): " + p.Value.assetName);
             create4.WriteLine(
                 "number of times this object shows up across all Scenes: " + p.Value.count
             );
             create4.WriteLine("list of scenes that this unique object shows up in: ");
-            foreach (KeyValuePair<String, String> s in p.Value.Scenes_To_hName)
-            {
+            foreach (KeyValuePair<String, String> s in p.Value.Scenes_To_hName) {
                 create4.WriteLine(
                     s.Key + " | name of instance of this object in scene: " + s.Value
                 );
diff --git a/unity/Assets/Scripts/Television.cs b/unity/Assets/Scripts/Television.cs
index ecc01bad62..462b5fa536 100644
--- a/unity/Assets/Scripts/Television.cs
+++ b/unity/Assets/Scripts/Television.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Television : MonoBehaviour
-{
+public class Television : MonoBehaviour {
     public SimObj ParentSimObj;
     public Renderer[] ScreenRenderers;
     public int[] ScreenMatIndexes;
@@ -18,38 +17,27 @@ public class Television : MonoBehaviour
     // 2 - On, Unsynced
     // 3 - On, Synced
 
-    public void Update()
-    {
-        if (ParentSimObj == null)
-        {
+    public void Update() {
+        if (ParentSimObj == null) {
             return;
         }
 
-        if (OffScreenMat == null || OnScreenMat == null)
-        {
+        if (OffScreenMat == null || OnScreenMat == null) {
             return;
         }
 
         Material mat = OffScreenMat;
 
-        if (!Application.isPlaying)
-        {
-            if (EditorOn)
-            {
-                if (EditorConnected)
-                {
+        if (!Application.isPlaying) {
+            if (EditorOn) {
+                if (EditorConnected) {
                     mat = SyncedScreenMat;
-                }
-                else
-                {
+                } else {
                     mat = OnScreenMat;
                 }
             }
-        }
-        else
-        {
-            switch (ParentSimObj.Animator.GetInteger("AnimState1"))
-            {
+        } else {
+            switch (ParentSimObj.Animator.GetInteger("AnimState1")) {
                 case 1:
                 default:
                     break;
@@ -64,8 +52,7 @@ public void Update()
             }
         }
 
-        for (int i = 0; i < ScreenRenderers.Length; i++)
-        {
+        for (int i = 0; i < ScreenRenderers.Length; i++) {
             Material[] sharedMats = ScreenRenderers[i].sharedMaterials;
             sharedMats[ScreenMatIndexes[i]] = mat;
             ScreenRenderers[i].sharedMaterials = sharedMats;
diff --git a/unity/Assets/Scripts/TestCabinetVisibility.cs b/unity/Assets/Scripts/TestCabinetVisibility.cs
index 94f7286e8e..3dae38ed40 100644
--- a/unity/Assets/Scripts/TestCabinetVisibility.cs
+++ b/unity/Assets/Scripts/TestCabinetVisibility.cs
@@ -6,8 +6,7 @@
 using UnityEditor;
 #endif
 
-public class TestCabinetVisibility : MonoBehaviour
-{
+public class TestCabinetVisibility : MonoBehaviour {
 #if UNITY_EDITOR
     public float MinDistance = 0.75f;
     public float MaxDistance = 2f;
@@ -25,34 +24,28 @@ public class TestCabinetVisibility : MonoBehaviour
     SimObj currentCabinet;
     List<Vector3> positions = new List<Vector3>();
 
-    void OnDrawGizmos()
-    {
+    void OnDrawGizmos() {
         Gizmos.color = Color.white;
-        foreach (Vector3 pos in positions)
-        {
+        foreach (Vector3 pos in positions) {
             Gizmos.DrawWireCube(pos + Vector3.down, Vector3.one * 0.05f);
         }
 
         Gizmos.color = Color.Lerp(Color.red, Color.clear, 0.5f);
-        if (ProblemCabinets.Count > 0 && ProblemIndex < ProblemCabinets.Count)
-        {
+        if (ProblemCabinets.Count > 0 && ProblemIndex < ProblemCabinets.Count) {
             Gizmos.DrawSphere(ProblemCabinets[ProblemIndex].CenterPoint, 0.2f);
         }
 
         Gizmos.color = Color.green;
-        if (currentCabinet != null)
-        {
+        if (currentCabinet != null) {
             Gizmos.DrawSphere(currentCabinet.CenterPoint, 0.2f);
         }
     }
 
-    void OnDisable()
-    {
+    void OnDisable() {
         EditorUtility.ClearProgressBar();
     }
 
-    public IEnumerator Start()
-    {
+    public IEnumerator Start() {
         // wait for cabinets to set their startup positions
         yield return new WaitForSeconds(0.1f);
 
@@ -64,18 +57,15 @@ public IEnumerator Start()
         EditorUtility.DisplayProgressBar("Testing cabinets", "Loading", 0f);
         Camera cam = gameObject.GetComponentInChildren<Camera>();
         HashSet<SimObj> cabinets = new HashSet<SimObj>();
-        foreach (SimObj o in SceneManager.Current.ObjectsInScene)
-        {
-            if (o.Type == SimObjType.Cabinet)
-            {
+        foreach (SimObj o in SceneManager.Current.ObjectsInScene) {
+            if (o.Type == SimObjType.Cabinet) {
                 cabinets.Add(o);
             }
         }
         int cabinetNum = 0;
         Vector3 startPos = transform.position;
 
-        foreach (SimObj c in cabinets)
-        {
+        foreach (SimObj c in cabinets) {
             // bool seenAtLeastOnce = false;
             currentCabinet = c;
             // close the cabinet
@@ -85,16 +75,14 @@ public IEnumerator Start()
             cabinetPos.y = startPos.y;
             positions.Clear();
             int numSkippedPositions = 0;
-            while (positions.Count < ChecksPerCabinet && numSkippedPositions < MaxSkippedPositions)
-            {
+            while (positions.Count < ChecksPerCabinet && numSkippedPositions < MaxSkippedPositions) {
                 // get a point inside a circle
                 Vector3 randomPos = cabinetPos;
                 randomPos.x += (Random.value - 0.5f) * MaxDistance;
                 randomPos.z += (Random.value - 0.5f) * MaxDistance;
                 randomPos.y = startPos.y;
                 // if the circle is too close to the cabinet, move away
-                if (Vector3.Distance(cabinetPos, randomPos) < MinDistance)
-                {
+                if (Vector3.Distance(cabinetPos, randomPos) < MinDistance) {
                     // don't include it
                     continue;
                 }
@@ -112,12 +100,9 @@ public IEnumerator Start()
                     !aboveGround
                     || !hit.collider.CompareTag(SimUtil.StructureTag)
                     || !hit.collider.name.Equals("Floor")
-                )
-                {
+                ) {
                     numSkippedPositions++;
-                }
-                else
-                {
+                } else {
                     aboveGround = true;
                 }
                 bool hasOverlap = false;
@@ -128,31 +113,24 @@ public IEnumerator Start()
                     SimUtil.RaycastVisibleLayerMask,
                     QueryTriggerInteraction.Ignore
                 );
-                foreach (Collider collider in overlap)
-                {
-                    if (!collider.name.Equals("Floor"))
-                    {
+                foreach (Collider collider in overlap) {
+                    if (!collider.name.Equals("Floor")) {
                         hasOverlap = true;
                         break;
                     }
                 }
-                if (aboveGround && !hasOverlap)
-                {
+                if (aboveGround && !hasOverlap) {
                     positions.Add(randomPos);
-                }
-                else
-                {
+                } else {
                     numSkippedPositions++;
-                    if (numSkippedPositions >= MaxSkippedPositions)
-                    {
+                    if (numSkippedPositions >= MaxSkippedPositions) {
                         Debug.Log("Skipped too many positions, total is " + positions.Count);
                     }
                 }
             }
             // start moving
             float progressInterval = 1f / cabinets.Count;
-            for (int i = 0; i < positions.Count; i++)
-            {
+            for (int i = 0; i < positions.Count; i++) {
                 // move the agent to the random position
                 transform.position = positions[i];
                 // look around the world in 60-degree increments
@@ -162,12 +140,10 @@ public IEnumerator Start()
                     ((float)cabinetNum / cabinets.Count)
                         + (((float)i / ChecksPerCabinet) * progressInterval)
                 );
-                for (int j = 0; j < horizonAngles.Length; j++)
-                {
+                for (int j = 0; j < horizonAngles.Length; j++) {
                     float horizonAngle = horizonAngles[j];
                     float headingAngle = 0f;
-                    for (int k = 0; k < headingAngles.Length; k++)
-                    {
+                    for (int k = 0; k < headingAngles.Length; k++) {
                         headingAngle = headingAngles[k];
                         // at each step, check whether we can see the cabinet
                         bool cabinetVisibleClosed = false;
@@ -181,18 +157,15 @@ public IEnumerator Start()
                         // get visible again
                         foreach (
                             SimObj visibleSimObj in SimUtil.GetAllVisibleSimObjs(cam, MaxDistance)
-                        )
-                        {
-                            if (visibleSimObj == currentCabinet)
-                            {
+                        ) {
+                            if (visibleSimObj == currentCabinet) {
                                 cabinetVisibleClosed = true;
                                 // seenAtLeastOnce = true;
                                 break;
                             }
                         }
                         // don't bother if we didn't see anything
-                        if (!cabinetVisibleClosed)
-                        {
+                        if (!cabinetVisibleClosed) {
                             yield return null;
                             continue;
                         }
@@ -204,29 +177,24 @@ SimObj visibleSimObj in SimUtil.GetAllVisibleSimObjs(cam, MaxDistance)
                         // get visible objects again
                         foreach (
                             SimObj visibleSimObj in SimUtil.GetAllVisibleSimObjs(cam, MaxDistance)
-                        )
-                        {
-                            if (visibleSimObj == currentCabinet)
-                            {
+                        ) {
+                            if (visibleSimObj == currentCabinet) {
                                 cabinetVisibleOpen = true;
                                 // seenAtLeastOnce = true;
                                 break;
                             }
                         }
                         // now check to see if there were any we could see closed that we CAN'T see open
-                        if (cabinetVisibleClosed && !cabinetVisibleOpen)
-                        {
+                        if (cabinetVisibleClosed && !cabinetVisibleOpen) {
                             // we found one we could see before, but can't see now
-                            if (!ProblemCabinets.Contains(currentCabinet))
-                            {
+                            if (!ProblemCabinets.Contains(currentCabinet)) {
                                 ProblemCabinets.Add(currentCabinet);
                                 ProblemPositions.Add(positions[i]);
                                 ProblemHeadingAngles.Add(headingAngle);
                                 ProblemhHorizonAngles.Add(horizonAngle);
                             }
                             yield return new WaitForSeconds(1f);
-                            if (StopOnError)
-                            {
+                            if (StopOnError) {
                                 UnityEditor.Selection.activeGameObject = currentCabinet.gameObject;
                                 EditorUtility.ClearProgressBar();
                                 yield break;
diff --git a/unity/Assets/Scripts/ThorContractlessStandardResolver.cs b/unity/Assets/Scripts/ThorContractlessStandardResolver.cs
index ede8f6daaf..bfcaf6d5ef 100644
--- a/unity/Assets/Scripts/ThorContractlessStandardResolver.cs
+++ b/unity/Assets/Scripts/ThorContractlessStandardResolver.cs
@@ -17,23 +17,19 @@ This resolver is necessary because the MessagePack library does not allow modifi
   the UnityResolver and we want our output to match the json output for Vector3.
 
 */
-namespace MessagePack.Resolvers
-{
+namespace MessagePack.Resolvers {
     public class NavMeshPathFormatter
-        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.AI.NavMeshPath>
-    {
+        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.AI.NavMeshPath> {
         public void Serialize(
             ref MessagePackWriter writer,
             global::UnityEngine.AI.NavMeshPath value,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             writer.WriteMapHeader(2);
             writer.Write("corners");
             writer.WriteArrayHeader(value.corners.Length);
             Vector3Formatter f = new Vector3Formatter();
-            foreach (Vector3 c in value.corners)
-            {
+            foreach (Vector3 c in value.corners) {
                 f.Serialize(ref writer, c, options);
             }
             writer.Write("status");
@@ -43,8 +39,7 @@ public void Serialize(
         public global::UnityEngine.AI.NavMeshPath Deserialize(
             ref MessagePackReader reader,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             throw new System.NotImplementedException();
         }
     }
@@ -53,8 +48,7 @@ public void Serialize(
     // base type, such as the case for droneAgent and droneObjectMetadata.  This is purely for performance (on msgpack's part)
     // The following two formatters examine the types of the values to be serialized and use the appropriate formatter.
     public class ObjectMetadataFormatter
-        : global::MessagePack.Formatters.IMessagePackFormatter<ObjectMetadata[]>
-    {
+        : global::MessagePack.Formatters.IMessagePackFormatter<ObjectMetadata[]> {
         private IMessagePackFormatter<ObjectMetadata[]> formatter =
             DynamicGenericResolver.Instance.GetFormatter<ObjectMetadata[]>();
         private IMessagePackFormatter<DroneObjectMetadata> droneFormatter =
@@ -64,23 +58,17 @@ public void Serialize(
             ref MessagePackWriter writer,
             ObjectMetadata[] value,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
-            if (value == null)
-            {
+        ) {
+            if (value == null) {
                 writer.WriteNil();
                 return;
             }
-            if (value.Length > 0 && value[0].GetType() == typeof(DroneObjectMetadata))
-            {
+            if (value.Length > 0 && value[0].GetType() == typeof(DroneObjectMetadata)) {
                 writer.WriteArrayHeader(value.Length);
-                foreach (var v in value)
-                {
+                foreach (var v in value) {
                     droneFormatter.Serialize(ref writer, (DroneObjectMetadata)v, options);
                 }
-            }
-            else
-            {
+            } else {
                 formatter.Serialize(ref writer, value, options);
             }
         }
@@ -88,21 +76,18 @@ public void Serialize(
         public ObjectMetadata[] Deserialize(
             ref MessagePackReader reader,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             throw new System.NotImplementedException();
         }
     }
 
     public class Vector4Formatter
-        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector4>
-    {
+        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector4> {
         public void Serialize(
             ref MessagePackWriter writer,
             global::UnityEngine.Vector4 value,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             writer.WriteMapHeader(4);
             writer.Write("x");
             writer.Write(value.x);
@@ -117,10 +102,8 @@ public void Serialize(
         public global::UnityEngine.Vector4 Deserialize(
             ref MessagePackReader reader,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
-            if (reader.TryReadNil())
-            {
+        ) {
+            if (reader.TryReadNil()) {
                 throw new InvalidOperationException("Cannot deserialize a nil value to a Vector3.");
             }
 
@@ -130,12 +113,10 @@ public void Serialize(
                 z = 0,
                 w = 0;
 
-            for (int i = 0; i < mapLength; i++)
-            {
+            for (int i = 0; i < mapLength; i++) {
                 string property = reader.ReadString();
 
-                switch (property)
-                {
+                switch (property) {
                     case "x":
                         x = reader.ReadSingle();
                         break;
@@ -159,8 +140,7 @@ public void Serialize(
     }
 
     public class AgentMetadataFormatter
-        : global::MessagePack.Formatters.IMessagePackFormatter<AgentMetadata>
-    {
+        : global::MessagePack.Formatters.IMessagePackFormatter<AgentMetadata> {
         private IMessagePackFormatter<AgentMetadata> formatter =
             DynamicObjectResolver.Instance.GetFormatter<AgentMetadata>();
         private IMessagePackFormatter<DroneAgentMetadata> droneFormatter =
@@ -170,20 +150,15 @@ public void Serialize(
             ref MessagePackWriter writer,
             AgentMetadata value,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
-            if (value == null)
-            {
+        ) {
+            if (value == null) {
                 writer.WriteNil();
                 return;
             }
             Type type = value.GetType();
-            if (type == typeof(DroneAgentMetadata))
-            {
+            if (type == typeof(DroneAgentMetadata)) {
                 droneFormatter.Serialize(ref writer, (DroneAgentMetadata)value, options);
-            }
-            else
-            {
+            } else {
                 formatter.Serialize(ref writer, value, options);
             }
         }
@@ -191,21 +166,18 @@ public void Serialize(
         public AgentMetadata Deserialize(
             ref MessagePackReader reader,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             throw new System.NotImplementedException();
         }
     }
 
     public class Vector3Formatter
-        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector3>
-    {
+        : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector3> {
         public void Serialize(
             ref MessagePackWriter writer,
             global::UnityEngine.Vector3 value,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
+        ) {
             writer.WriteMapHeader(3);
             writer.Write("x");
             writer.Write(value.x);
@@ -218,10 +190,8 @@ public void Serialize(
         public global::UnityEngine.Vector3 Deserialize(
             ref MessagePackReader reader,
             global::MessagePack.MessagePackSerializerOptions options
-        )
-        {
-            if (reader.TryReadNil())
-            {
+        ) {
+            if (reader.TryReadNil()) {
                 throw new InvalidOperationException("Cannot deserialize a nil value to a Vector3.");
             }
 
@@ -230,12 +200,10 @@ public void Serialize(
                 y = 0,
                 z = 0;
 
-            for (int i = 0; i < mapLength; i++)
-            {
+            for (int i = 0; i < mapLength; i++) {
                 string property = reader.ReadString();
 
-                switch (property)
-                {
+                switch (property) {
                     case "x":
                         x = reader.ReadSingle();
                         break;
@@ -255,8 +223,7 @@ public void Serialize(
         }
     }
 
-    public class ThorContractlessStandardResolver : IFormatterResolver
-    {
+    public class ThorContractlessStandardResolver : IFormatterResolver {
         public static readonly MessagePackSerializerOptions Options;
         public static readonly ThorContractlessStandardResolver Instance;
 
@@ -273,27 +240,22 @@ public class ThorContractlessStandardResolver : IFormatterResolver
 #endif
         };
 
-        static ThorContractlessStandardResolver()
-        {
+        static ThorContractlessStandardResolver() {
             Instance = new ThorContractlessStandardResolver();
             Options = MessagePackSerializerOptions.Standard.WithResolver(Instance);
         }
 
         private ThorContractlessStandardResolver() { }
 
-        public IMessagePackFormatter<T> GetFormatter<T>()
-        {
+        public IMessagePackFormatter<T> GetFormatter<T>() {
             return FormatterCache<T>.Formatter;
         }
 
-        private static class FormatterCache<T>
-        {
+        private static class FormatterCache<T> {
             public static readonly IMessagePackFormatter<T> Formatter;
 
-            static FormatterCache()
-            {
-                if (typeof(T) == typeof(object))
-                {
+            static FormatterCache() {
+                if (typeof(T) == typeof(object)) {
                     // final fallback
 #if !ENABLE_IL2CPP
                     Formatter =
@@ -301,14 +263,10 @@ static FormatterCache()
 #else
                     Formatter = PrimitiveObjectResolver.Instance.GetFormatter<T>();
 #endif
-                }
-                else
-                {
-                    foreach (IFormatterResolver item in Resolvers)
-                    {
+                } else {
+                    foreach (IFormatterResolver item in Resolvers) {
                         IMessagePackFormatter<T> f = item.GetFormatter<T>();
-                        if (f != null)
-                        {
+                        if (f != null) {
                             Formatter = f;
                             return;
                         }
@@ -319,19 +277,16 @@ static FormatterCache()
     }
 }
 
-public class ThorUnityResolver : IFormatterResolver
-{
+public class ThorUnityResolver : IFormatterResolver {
     public static readonly ThorUnityResolver Instance = new ThorUnityResolver();
 
     private ThorUnityResolver() { }
 
-    public IMessagePackFormatter<T> GetFormatter<T>()
-    {
+    public IMessagePackFormatter<T> GetFormatter<T>() {
         return FormatterCache<T>.Formatter;
     }
 
-    private static class FormatterCache<T>
-    {
+    private static class FormatterCache<T> {
         public static readonly IMessagePackFormatter<T> Formatter;
         private static readonly Dictionary<Type, object> FormatterMap = new Dictionary<
             Type,
@@ -346,16 +301,13 @@ private static class FormatterCache<T>
             { typeof(ObjectMetadata[]), new ObjectMetadataFormatter() }
         };
 
-        static FormatterCache()
-        {
+        static FormatterCache() {
             Formatter = (IMessagePackFormatter<T>)GetFormatter(typeof(T));
         }
 
-        static object GetFormatter(Type t)
-        {
+        static object GetFormatter(Type t) {
             object formatter;
-            if (FormatterMap.TryGetValue(t, out formatter))
-            {
+            if (FormatterMap.TryGetValue(t, out formatter)) {
                 return formatter;
             }
 
diff --git a/unity/Assets/Scripts/Toaster.cs b/unity/Assets/Scripts/Toaster.cs
index a33c7c531e..1ffb2eec6f 100644
--- a/unity/Assets/Scripts/Toaster.cs
+++ b/unity/Assets/Scripts/Toaster.cs
@@ -2,19 +2,16 @@
 using System.Collections;
 using UnityEngine;
 
-public class Toaster : MonoBehaviour
-{
+public class Toaster : MonoBehaviour {
     // private ObjectSpecificReceptacle osr;
     // private CanToggleOnOff onOff;
 
-    void Start()
-    {
+    void Start() {
         // osr = gameObject.GetComponent<ObjectSpecificReceptacle>();
         // onOff = gameObject.GetComponent<CanToggleOnOff>();
     }
 
-    void Update()
-    {
+    void Update() {
         // Note: Moved This call to the HeatZone that is turned on when the toaster is turned on
 
 
diff --git a/unity/Assets/Scripts/Toilet.cs b/unity/Assets/Scripts/Toilet.cs
index 579960752e..20a2957b3e 100644
--- a/unity/Assets/Scripts/Toilet.cs
+++ b/unity/Assets/Scripts/Toilet.cs
@@ -3,8 +3,7 @@
 using UnityEngine;
 
 [ExecuteInEditMode]
-public class Toilet : MonoBehaviour
-{
+public class Toilet : MonoBehaviour {
     public SimObj ParentSimObj;
     public Transform Lid;
     public Vector3 OpenRotation;
@@ -14,20 +13,16 @@ public class Toilet : MonoBehaviour
     [Range(0, 2)]
     public int EditorState = 0;
 
-    void OnEnable()
-    {
+    void OnEnable() {
         ParentSimObj = gameObject.GetComponent<SimObj>();
-        if (ParentSimObj == null)
-        {
+        if (ParentSimObj == null) {
             ParentSimObj = gameObject.AddComponent<SimObj>();
         }
         ParentSimObj.Type = SimObjType.Toilet;
 
-        if (!Application.isPlaying)
-        {
+        if (!Application.isPlaying) {
             Animator a = ParentSimObj.gameObject.GetComponent<Animator>();
-            if (a == null)
-            {
+            if (a == null) {
                 a = ParentSimObj.gameObject.AddComponent<Animator>();
                 a.runtimeAnimatorController =
                     Resources.Load("StateAnimController") as RuntimeAnimatorController;
@@ -36,11 +31,9 @@ void OnEnable()
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         int state = EditorState;
-        if (Application.isPlaying)
-        {
+        if (Application.isPlaying) {
             state = ParentSimObj.Animator.GetInteger("AnimState1");
         }
 
@@ -48,8 +41,7 @@ void Update()
         // 1 - open, dirty
         // 2 - open, clean
 
-        switch (state)
-        {
+        switch (state) {
             case 0:
             default:
                 Lid.localEulerAngles = ClosedRotation;
diff --git a/unity/Assets/Scripts/TransformExtension.cs b/unity/Assets/Scripts/TransformExtension.cs
index 95f1af6992..eaff8b3a74 100644
--- a/unity/Assets/Scripts/TransformExtension.cs
+++ b/unity/Assets/Scripts/TransformExtension.cs
@@ -1,19 +1,13 @@
 using System;
 using UnityEngine;
 
-public static class TransformExtension
-{
-    public static Transform FirstChildOrDefault(this Transform parent, Func<Transform, bool> query)
-    {
-        if (query(parent))
-        {
+public static class TransformExtension {
+    public static Transform FirstChildOrDefault(this Transform parent, Func<Transform, bool> query) {
+        if (query(parent)) {
             return parent;
-        }
-        else
-        {
+        } else {
             Transform result = null;
-            for (int i = 0; i < parent.childCount; i++)
-            {
+            for (int i = 0; i < parent.childCount; i++) {
                 var child = parent.GetChild(i);
                 var match = child.FirstChildOrDefault(query);
                 result = match != null ? match : result;
diff --git a/unity/Assets/Scripts/UsedUp.cs b/unity/Assets/Scripts/UsedUp.cs
index c65e2dbdef..90dc9d5f09 100644
--- a/unity/Assets/Scripts/UsedUp.cs
+++ b/unity/Assets/Scripts/UsedUp.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class UsedUp : MonoBehaviour
-{
+public class UsedUp : MonoBehaviour {
     [SerializeField]
     protected MeshRenderer usedUpRenderer;
 
@@ -27,19 +26,16 @@ void Start() { }
     // Update is called once per frame
     void Update() { }
 
-    public void UseUp()
-    {
+    public void UseUp() {
         usedUpRenderer.enabled = false;
 
         // disable all colliders that are used up
-        foreach (Collider col in usedUpColliders)
-        {
+        foreach (Collider col in usedUpColliders) {
             col.enabled = false;
         }
 
         // disable all trigger colliders that are used up
-        foreach (Collider col in usedUpTriggerColliders)
-        {
+        foreach (Collider col in usedUpTriggerColliders) {
             col.enabled = false;
         }
 
diff --git a/unity/Assets/Scripts/VisualizationHeatmapCSV.cs b/unity/Assets/Scripts/VisualizationHeatmapCSV.cs
index 377d0b1782..6a0f99e550 100644
--- a/unity/Assets/Scripts/VisualizationHeatmapCSV.cs
+++ b/unity/Assets/Scripts/VisualizationHeatmapCSV.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class VisualizationHeatmapCSV : MonoBehaviour
-{
+public class VisualizationHeatmapCSV : MonoBehaviour {
     public TextAsset CSVFile;
 
     public List<float> xvalues;
@@ -15,15 +14,13 @@ public class VisualizationHeatmapCSV : MonoBehaviour
     public GameObject prefabHeavy;
 
     // Use this for initialization
-    void Start()
-    {
+    void Start() {
         string[] data = CSVFile.text.Split(new char[] { '\n' });
         float x,
             z,
             r;
 
-        for (int i = 1; i < data.Length - 1; i++)
-        {
+        for (int i = 1; i < data.Length - 1; i++) {
             string[] row = data[i].Split(new char[] { ',' });
 
             float.TryParse(row[0], out x);
@@ -36,8 +33,7 @@ void Start()
             rotationvalues.Add(r);
         }
 
-        for (int i = 0; i < xvalues.Count; i++)
-        {
+        for (int i = 0; i < xvalues.Count; i++) {
             Vector3 pos = new Vector3(xvalues[i], 1, zvalues[i]);
             Vector3 rot = new Vector3(0, rotationvalues[i], 0);
 
diff --git a/unity/Assets/Scripts/WallProperties.cs b/unity/Assets/Scripts/WallProperties.cs
index be9a464293..f07ebf44ac 100644
--- a/unity/Assets/Scripts/WallProperties.cs
+++ b/unity/Assets/Scripts/WallProperties.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class WallProperties : MonoBehaviour
-{
+public class WallProperties : MonoBehaviour {
     public string RoomId;
 }
diff --git a/unity/Assets/Scripts/WhatIsInsideMagnetSphere.cs b/unity/Assets/Scripts/WhatIsInsideMagnetSphere.cs
index 3cd94bff03..00fd8d4b48 100644
--- a/unity/Assets/Scripts/WhatIsInsideMagnetSphere.cs
+++ b/unity/Assets/Scripts/WhatIsInsideMagnetSphere.cs
@@ -3,8 +3,7 @@
 using System.Linq;
 using UnityEngine;
 
-public class WhatIsInsideMagnetSphere : MonoBehaviour
-{
+public class WhatIsInsideMagnetSphere : MonoBehaviour {
     [SerializeField]
     protected List<SimObjPhysics> CurrentlyContainedSOP = new List<SimObjPhysics>();
     SphereCollider sphereCol = null;
@@ -12,16 +11,13 @@ public class WhatIsInsideMagnetSphere : MonoBehaviour
     // check if the sphere is actively colliding with anything
     // public bool isColliding;
     // Start is called before the first frame update
-    void Start()
-    {
-        if (sphereCol == null)
-        {
+    void Start() {
+        if (sphereCol == null) {
             sphereCol = gameObject.GetComponent<SphereCollider>();
         }
     }
 
-    public List<SimObjPhysics> CurrentlyContainedSimObjects(bool onlyPickupable)
-    {
+    public List<SimObjPhysics> CurrentlyContainedSimObjects(bool onlyPickupable) {
         // clear lists of contained objects
 
         // create overlap sphere same location and dimensions as sphere collider
@@ -41,13 +37,10 @@ public List<SimObjPhysics> CurrentlyContainedSimObjects(bool onlyPickupable)
             ),
             queryTriggerInteraction: QueryTriggerInteraction.Ignore
         );
-        foreach (var col in hitColliders)
-        {
+        foreach (var col in hitColliders) {
             SimObjPhysics sop = col.GetComponentInParent<SimObjPhysics>();
-            if (sop != null)
-            {
-                if ((!onlyPickupable) || sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup)
-                {
+            if (sop != null) {
+                if ((!onlyPickupable) || sop.PrimaryProperty == SimObjPrimaryProperty.CanPickup) {
                     currentlyContainedObjects.Add(sop);
                 }
             }
diff --git a/unity/Assets/Scripts/agent_trackball_rotation.cs b/unity/Assets/Scripts/agent_trackball_rotation.cs
index 78dabc8519..1c2e0e5cdc 100644
--- a/unity/Assets/Scripts/agent_trackball_rotation.cs
+++ b/unity/Assets/Scripts/agent_trackball_rotation.cs
@@ -2,8 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class agent_trackball_rotation : MonoBehaviour
-{
+public class agent_trackball_rotation : MonoBehaviour {
     float ballPositionToRotationRatio = 3 * Mathf.PI / 1200; // Circumference over 360 euler degrees
     float changeInPosition; // How far agent has moved
     Vector3 currentPosition; // Ball's current position
@@ -26,8 +25,7 @@ void Start() // Initialize "previous" values
         prevLookDirection = gameObject.transform.parent.transform.rotation.eulerAngles.y;
     }
 
-    void Update()
-    {
+    void Update() {
         currentPosition = new Vector3(
             gameObject.transform.position.x,
             0,
@@ -46,9 +44,8 @@ void Update()
                 .eulerAngles; // Ball's rotation values
             gameObject.transform.Rotate(rotationVector, Space.World); // Rotate ball
             prevPosition = currentPosition; // Record position to compare against next frame
-        }
-        else // If agent is still
-        {
+        } else // If agent is still
+          {
             lookRotation = currentLookDirection - prevLookDirection; // How far agent has rotated between frames
 
             if (lookRotation != 0) // If agent has rotated
diff --git a/unity/Assets/Scripts/childcollider.cs b/unity/Assets/Scripts/childcollider.cs
index 6140d60694..efcced8b7c 100644
--- a/unity/Assets/Scripts/childcollider.cs
+++ b/unity/Assets/Scripts/childcollider.cs
@@ -2,16 +2,14 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class childcollider : MonoBehaviour
-{
+public class childcollider : MonoBehaviour {
     // Use this for initialization
     void Start() { }
 
     // Update is called once per frame
     void Update() { }
 
-    void OnCollisionEnter(Collision collision)
-    {
+    void OnCollisionEnter(Collision collision) {
         print("collision enteR!");
         this.GetComponent<Collider>().attachedRigidbody.SendMessage("OnCollisionEnter", collision);
     }
diff --git a/unity/Assets/Scripts/coffeemachine.cs b/unity/Assets/Scripts/coffeemachine.cs
index 2d30319d81..cdef27f6e3 100644
--- a/unity/Assets/Scripts/coffeemachine.cs
+++ b/unity/Assets/Scripts/coffeemachine.cs
@@ -2,39 +2,33 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class coffeemachine : MonoBehaviour
-{
+public class coffeemachine : MonoBehaviour {
     private ObjectSpecificReceptacle osr;
     private CanToggleOnOff onOff;
 
     // Start is called before the first frame update
-    void Start()
-    {
+    void Start() {
         osr = gameObject.GetComponent<ObjectSpecificReceptacle>();
         onOff = gameObject.GetComponent<CanToggleOnOff>();
     }
 
     // Update is called once per frame
-    void Update()
-    {
+    void Update() {
         Serve();
     }
 
-    public void Serve()
-    {
+    public void Serve() {
         SimObjPhysics target;
 
         if (
             osr.attachPoint.transform.GetComponentInChildren<SimObjPhysics>()
             && onOff.isTurnedOnOrOff()
-        )
-        {
+        ) {
             target = osr.attachPoint.transform.GetComponentInChildren<SimObjPhysics>();
             Fill f = target.GetComponent<Fill>();
 
             // if not already toasted, toast it!
-            if (!f.IsFilled())
-            {
+            if (!f.IsFilled()) {
                 f.FillObject("coffee");
             }
         }