Readme Update & Cleanup

Updated readme to reflect changes in recent pull requests. Cleaned-up
some code. Not much to look at here.