Better templates, now ignoring empty comments