Feature/misc cleaning

* Small code tweak
* Command-line options are now `--underscore_free`–er, I mean…`--underscore-free`! :tongue: