Gemspec cleanup, small refactor