redid file templates, also did some code reformatting