Code refactoring. Simplified API.