Renamed gemspec, couple refactorings