Improved ContactsService and renamed main class