code cleanuo
clean up templates