Cleaned up some code.
Updated Readme.md