Some code renames and code formatting
Updating the readme file