Switch back from spec to source file, instead of creating a spec for the
spec.
Minor code cleanup.
Merge pull request #5 from benastan/master

Switch back from spec to source file, instead of creating a spec for the spec.