cleared unwanted code and done few modifications