Cleanup: alphabetized all methods