Simplify code further

- Update README
- Simplifies codebase