Source formatting
Source formatting - Keep the same pattern from other commands until we find a replacement for defaultCallback API
Source formatting #32