housekeeping. update the template and tidy up the indentation