Cleaned up Contact and Rolodex specs