Tidy up the component template