Fix typo and reorganize