Small code cleanup and updated gemspec