Add --remove-extra parameter to the format command
Refactored input defaults