Cleaned header templates for #35.