Cleanup code, update README.md