Quick refactoring

Simplifying Spec class