Adding few improvements and some helpful comments