Cleaned up rspec