Adding executor service for threads and remove unnecessary threads
Adding executor service for threads and remove unnecessary threads