Refactor code and fix smells
Versioned API
Fix
Bump version