Refactoring, commenting and initial sort order