Refactor tstat excercises