Breaks out the CLI
Formatting fixes