Remove extraneous newline in template
Removed debugging notify and use class_name for portability