Cleaned up code and Added New featuers,Step defs Implementation methods