More rspec, some cleaning up code