Minor fix in specs.
Refactored.
Refactored.