Refactor code
Add a couple of todos
Bump version