Cleaned up some code.
Updated readme file