Cleaned up template markup