README updated and some code formatting