Refactored in a functional style
Correction to ordered lists