Refactored out cross validation code, renamed all models according to the convention in the paper