Commenting & slight restructure of UnityConfig