Make specs dryer and remove comments