Refactor gemspec