Spacing.
Reorganize code.
Fix gemspec.