refactored tennis match and tennis scores