Changes after review

1. Update CHANGES.
2. Run Eclipse formatter on modified code.
3. Removed unused modules.
4. Improve test coverage.