Refactor Round.py and RoundInstanceFactory