Some code refactorings

Created by: rosenfeld

While looking at the Rspec code for understanding how it works, I decided to propose some minor refactorings that make the code clearer in my opinion.

Please, take a look