Cleaned up Rolodex code