Code sorted

No changes, only the code is now sorted.