Reorder classes
Fix typo