Improve consistency and defaults
Add missing newline