refactored whoisrestservice and removed a few todos