Finished refactoring the calculations for pts and fpts_ds correlation