Fix --dry-run option per comments in PR

* Split dry-run out into a separate function
* Change output syntax to be more easily greppable
* Convert camelCase variables to snake_case