Minor refactoring
Bump version to 0.2.2