Gemspec refactored