Clean up the code, update README.txt