Refactor WTK