Simplify default connection
Cosmetics