Code Refractor and logging improvements