Moved commenting functionality to separate module