CleanSpec for 4.7