Made another commit with the necessary corrections, Kindly look into it :)