Cleaned up the ContactManagerImpl formatting, first pass