Rspec

Refactoring.