Refactor and clean specs.