cleaning up templates/id names