Simplifying the addComments code a bit