Clean up the code.
Changed specs to run --verbose.