cleanup and gemspec update