Improve torch placement code