- Fixed NPE bug.
- cleaned up code.
- Added integration test for content usage.