Refactor specs
Oops
Merge pull request #8 from pikesley/refactor

Refactor