Cleaned up template files, minor