Removed warnings and cleaned up template.