Moved round end verification into a separate class