Clean up Tintegrand code

make code more readable