Clean up and reformat leader commands and splits