Refactoring tornado