Shorter lines and more explicit default