extracted classes, property grouping. nodes and leaves
code cleanup
fixed accumulator