Refactored gemspec