pruned commented code