Updated templates to be more consistent and removed trailing spaces