Cleanup and specs.