twt-c training draft. Other refactoring