clean code
modification for running on csxweb04
add timeout for 1000 seconds