Remove a few redundant statements.
Refactored the in memory cache used for specs.
Fix a typo.
Merge pull request #343 from mschulkind/cleanup

A bit of spec refactoring/clean up.