typo fix & solution rearrangements