Yes, putting that into a separate template would be a great idea.