simplified the 'calculate_points' method and readability improvement in general