Clean up some rspec code