Clean up gemspec, refactoring