Fix/Refactor ExpandThread.coffee