Sorted some stuff