Updated logging settings
Updated exception handling
Refactoring
Code improvements
Code improvements