More code cleanup

More code cleanup, preparing the implement Roundinfo in code.