Refactor, reorganize and calculate diffpoints for two matchdays