added more details for logs + refactor for further enhancement #112