Spec cleanup
Merge pull request #109 from norzechowicz/cleanup

Specs cleanup