Re-sort methods
Update formatting
Durr