added simple templates reformatting