Making some minor changes to enhance readability.  Really just a safety commit before Brassa is pulled out