Refactor from code review
Fix unit tests and bump version