Minor clean up and migration to bundler gem format.