Clean up the specs a bit