Tidy up more specs