Added a wrapper for the comments so that the number of IF statements is reduced