Rework Tornado code to be cleaner and also avoid duplicate instances