Actually made the change to ensure that only one function is created for all comments.

Previous commit only extracted out a function