A little cleanup
Removed a couple of useless lines, still cleanup
Changed the timeout parameter to match the real world