Adding helpers and modifying code to prevent empty comment from displaying