some comments and clean up for timeout sample