Finish refactoring
Update gemspec