Cleaned code further, simplifying it. Updated README.