some more comments management and pruning