> In these functions, some logical jump of "goto" and variable > are redundant, thus remove them. Another wording suggestion: Return some values directly in a few function implementations. Thus remove local variables which became redundant with this refactoring. Regards, Markus
