Refactored Wikipedia logic to separate class.
More refactoring for readability.