remove some tbb references, update inl code formatting