Merge "Code Refractor and logging improvements"