More code factoring and comment improvements
More code factoring and comment improvements
More code factoring and comment improvements
More code factoring and comment improvements