- Changed version to 2.0.0
- Cleanup/comments