source code commented at logical block level
Trimmed other packages