Refactor LoggerFactory