Cleaned up UnitStatus