Some code sorting

Sorted it up