Same formatting changes in core.commands