Minor refactoring and renaming
Moved all strategies out to their own classes
Refactored out the sorting to a method
Fixed the paerson correlation strategy