ts refactoring #439

Closed mck1117 closed 4 weeks ago