Refactored Round.php