cleaning up template files with quick style improvements