Cleaned up some of the code ... removed comments and re-organized the
way that the default ou is recognized in the code.