minor refactoring and version update