Simplify data structures, update README.md