Addressed PR feedback.  Modified comments, slight code formatting and organization, fixed failing test based on argument name change.