Shortened suit name and refactored calculate_points