Clean up specs based on feedback.