Cleanup & formatted classes and modified Namespace Criteria specs