Tidying up size and partial order.
Name trimming.