Clearer spec names
Refactor
Refactor