Made UnitList neat