simplify interface
simplify API
cosmetic change
fix -fpure build
simplification
simplification
refactoring