Tinsy refactor