Code style and use a small fix in the defaults