Some refactoring of default values
Refactored formatting