Minor code organization fix
Bump version