Torm assist refactor