Removed extraneous comments.
Refactored spec support files.