Sorted some comments