Simplifying API
CodeAnalysis fixes for maintainability.
Test updates.
Updated demo.