A few code cleanups; performance slightly impacted
Another few tweaks to code
Updated the readme with some more info