clean up and restructure ts