Better comments and add coverage to rspec.