Started refactoring the code in a more object-oriented way
Fixed the algorithm on the English dump