change order and removing typo