edited the mapping syntax & applied few PEP8 styles
 some more code cleanups
 Edited the README file to show recent changes