Fix typo and move things around