Refactor LogModule