Cleaned up the specs