Addressed other technical edits from previous PR (not merged) in 4.1.4.1