Improve code organization
Add custom logger to avoid conflicts