Minor cleanup main template