Created CLI arguments for timeout and step
Created CLI arguments for timeout and step
Some cleanup