Remove unncessary changes and made modifications
Change the error message in main