Minor refactoring
Bumping version to 0.6.1