minor refactoring and version bump in gemspec