Cleaning up some code, comments and lists.  Updated readme